diff --git a/src/modules/echobox.rs b/src/modules/echobox.rs
index 55a0a41..c50b9ca 100644
--- a/src/modules/echobox.rs
+++ b/src/modules/echobox.rs
@@ -44,9 +44,13 @@ impl Module for EchoboxModule {
                             match split_command(&message.content) {
                                 Some((command, in_quote)) => {
                                     if command == self.prefix {
-                                        match echobox.echo(in_quote) {
-                                            Ok(out_quote) => message.reply(&format!("**Quote #{}:** {}", out_quote.id, out_quote.content)),
-                                            Err(error) => { error!("Error from echobox.echo(): {:?}", error) }
+                                        if !in_quote.is_empty() {
+                                            match echobox.echo(in_quote) {
+                                                Ok(out_quote) => message.reply(&format!("**Echobox, quote #{}:** {}", out_quote.id, out_quote.content)),
+                                                Err(error) => { error!("Error from echobox.echo(): {:?}", error) }
+                                            }
+                                        } else {
+                                            message.reply("**Echobox:** Please enter a quote.");
                                         }
                                     }
                                 },