diff --git a/src/main/java/florizz/core/Parser.java b/src/main/java/florizz/core/Parser.java
index d7c095510a..136b29b255 100644
--- a/src/main/java/florizz/core/Parser.java
+++ b/src/main/java/florizz/core/Parser.java
@@ -27,13 +27,19 @@ public static Command parse (String input) throws FlorizzException{
         }
     }
 
-    private static AddBouquetCommand handleAddBouquet(String input){
-        String newBouquetName = input.substring(input.indexOf(" ") + 1);
+    private static AddBouquetCommand handleAddBouquet(String input) throws FlorizzException{
+        if (!input.contains(" ")){
+            throw new FlorizzException("Did not include bouquet to add");
+        }
+        String newBouquetName = input.substring(input.indexOf(" ") + 1).trim();
         return new AddBouquetCommand(new Bouquet(newBouquetName));
     }
 
-    private static DeleteBouquetCommand handleDeleteBouquet(String input){
-        String bouquetToDelete = input.substring(input.indexOf(" ") + 1);
+    private static DeleteBouquetCommand handleDeleteBouquet(String input) throws FlorizzException{
+        if (!input.contains(" ")){
+            throw new FlorizzException("Did not include bouquet to delete");
+        }
+        String bouquetToDelete = input.substring(input.indexOf(" ") + 1).trim();
         return new DeleteBouquetCommand(new Bouquet(bouquetToDelete));
     }
 
diff --git a/src/main/java/florizz/objects/Bouquet.java b/src/main/java/florizz/objects/Bouquet.java
index 418bc55b5a..0089270685 100644
--- a/src/main/java/florizz/objects/Bouquet.java
+++ b/src/main/java/florizz/objects/Bouquet.java
@@ -1,5 +1,6 @@
 package florizz.objects;
 
+import java.util.Locale;
 import java.util.Objects;
 
 public class Bouquet {
@@ -28,6 +29,6 @@ public boolean equals(Object obj) {
         Bouquet c = (Bouquet) obj;
 
         // Compare the data members and return accordingly
-        return Objects.equals(c.bouquetName, this.bouquetName);
+        return Objects.equals(c.bouquetName.toUpperCase(), this.bouquetName.toUpperCase());
     }
 }