diff --git a/Mage/src/main/java/mage/abilities/effects/Effects.java b/Mage/src/main/java/mage/abilities/effects/Effects.java
index 3127ee3620b..dce5556d723 100644
--- a/Mage/src/main/java/mage/abilities/effects/Effects.java
+++ b/Mage/src/main/java/mage/abilities/effects/Effects.java
@@ -41,9 +41,6 @@ public class Effects extends ArrayList<Effect> {
         String lastRule = null;
         int effectNum = 0;
         for (Effect effect : this) {
-            if (effect == null) {
-                continue;
-            }
             String endString = "";
             String nextRule = effect.getText(mode);
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
index 684c288ce6a..4115b9c9f55 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
@@ -33,7 +33,9 @@ public class DoIfCostPaid extends OneShotEffect {
 
     public DoIfCostPaid(Effect effectOnPaid, Effect effectOnNotPaid, Cost cost, boolean optional) {
         this(effectOnPaid, cost, null, optional);
-        this.otherwiseEffects.add(effectOnNotPaid);
+        if (effectOnNotPaid != null) {
+            this.otherwiseEffects.add(effectOnNotPaid);
+        }
     }
 
     public DoIfCostPaid(Effect effectOnPaid, Cost cost, String chooseUseText) {
@@ -155,8 +157,8 @@ public class DoIfCostPaid extends OneShotEffect {
         if (!staticText.isEmpty()) {
             return staticText;
         }
-        String otherwiseText = otherwiseEffects.getText(mode);
-        return (optional ? "you may " : "") + getCostText() + ". If you do, " + executingEffects.getText(mode) + (!otherwiseText.isEmpty() ? " If you don't, " + otherwiseEffects.getText(mode) : "");
+        return (optional ? "you may " : "") + getCostText() + ". If you do, " + executingEffects.getText(mode)
+                + (!otherwiseEffects.isEmpty() ? " If you don't, " + otherwiseEffects.getText(mode) : "");
     }
 
     protected String getCostText() {