diff --git a/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java b/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java
index b980bd45ca..1a29292735 100644
--- a/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java
@@ -57,7 +57,11 @@ public class CastCommanderAbility extends SpellAbility {
         if (super.activate(game, noMana)) {
             // save amount of times commander was cast
             Integer castCount = (Integer) game.getState().getValue(sourceId + "_castCount");
-            castCount++;
+            if (castCount == null) {
+                castCount = 1;
+            } else {
+                castCount++;
+            }
             game.getState().setValue(sourceId + "_castCount", castCount);
             return true;
         }