diff --git a/bucket-tool b/bucket-tool
index 4c5f8d7..a5aaff6 100755
--- a/bucket-tool
+++ b/bucket-tool
@@ -302,6 +302,12 @@ while i < ARGV.count
         exit
       end
 
+    when FLAG_REGEX
+      # Catch all to prevent user from specifying a non-accounted for flag
+      puts "#{ARGV[i]} is not a valid flag."
+      usage
+      exit
+
     else
       i+=1
   end