diff --git a/src/main/java/florizz/core/Parser.java b/src/main/java/florizz/core/Parser.java
index e7a7d82915..438e2d0ba4 100644
--- a/src/main/java/florizz/core/Parser.java
+++ b/src/main/java/florizz/core/Parser.java
@@ -126,6 +126,10 @@ public static String[] commandHandler(String input) throws FlorizzException {
                     String[] arguments = new String[2];
                     String trimmedArgument = trimmedInput.substring(firstWhitespace).trim();
                     int secondWhitespace = trimmedArgument.indexOf(" ");
+                    if (secondWhitespace <0){
+                        throw new FlorizzException("Incorrect usage of remove." +
+                                " Correct format: remove <flowerName> /q <quantity> /from <bouquetName>");
+                    }
                     arguments[0] = FuzzyLogic.detectItem(trimmedArgument.substring(0,secondWhitespace));
                     arguments[1] = trimmedArgument.substring(secondWhitespace).trim();
                     outputs[1] = arguments[0] + " " + arguments[1];