diff --git a/app/models/command/cards.rb b/app/models/command/cards.rb
index 8ba9e4c74..d3e47792e 100644
--- a/app/models/command/cards.rb
+++ b/app/models/command/cards.rb
@@ -4,7 +4,7 @@ module Command::Cards
   included do
     store_accessor :data, :card_ids
 
-    validates_presence_of :card_ids
+    validates_presence_of :card_ids, :cards
   end
 
   def undoable?
diff --git a/app/models/command/parser/context.rb b/app/models/command/parser/context.rb
index 770477963..09591ce72 100644
--- a/app/models/command/parser/context.rb
+++ b/app/models/command/parser/context.rb
@@ -11,6 +11,8 @@ class Command::Parser::Context
       user.accessible_cards.where id: params[:id]
     elsif controller == "cards" && action == "index"
       filter.cards
+    else
+      Card.none
     end
   end