diff --git a/Mage.Sets/src/mage/cards/g/GavelOfTheRighteous.java b/Mage.Sets/src/mage/cards/g/GavelOfTheRighteous.java
index 46ac2dac38c..7e3b55d1d67 100644
--- a/Mage.Sets/src/mage/cards/g/GavelOfTheRighteous.java
+++ b/Mage.Sets/src/mage/cards/g/GavelOfTheRighteous.java
@@ -57,7 +57,7 @@ public final class GavelOfTheRighteous extends CardImpl {
                 Outcome.BoostCreature,
                 new OrCost(
                         "Pay {3} or remove a counter from {this}",
-                        new GenericManaCost(3), new RemoveCountersSourceCost(null)
+                        new GenericManaCost(3), new RemoveCountersSourceCost()
                 )
         ));
     }
diff --git a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java
index 593ffe442cc..e449d1158c6 100644
--- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java
+++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java
@@ -26,11 +26,15 @@ public class RemoveCountersSourceCost extends CostImpl {
     private final int amount;
     private final String name;
 
+    public RemoveCountersSourceCost() {
+        this((Counter) null);
+    }
+
     public RemoveCountersSourceCost(Counter counter) {
         this.amount = counter != null ? counter.getCount() : 1;
         this.name = counter != null ? counter.getName() : "";
         this.text = new StringBuilder("remove ")
-                .append((amount == 1 ? CounterType.findArticle(counter.getName()) : CardUtil.numberToText(amount)))
+                .append((amount == 1 ? CounterType.findArticle(name) : CardUtil.numberToText(amount)))
                 .append(name.isEmpty() ? "" : (' ' + name))
                 .append(" counter")
                 .append((amount != 1 ? "s" : ""))