diff --git a/Mage.Sets/src/mage/cards/r/ReturnOfTheWildspeaker.java b/Mage.Sets/src/mage/cards/r/ReturnOfTheWildspeaker.java
index 93e95bd7eba..ea0ae6927e6 100644
--- a/Mage.Sets/src/mage/cards/r/ReturnOfTheWildspeaker.java
+++ b/Mage.Sets/src/mage/cards/r/ReturnOfTheWildspeaker.java
@@ -69,7 +69,7 @@ enum ReturnOfTheWildspeakerValue implements DynamicValue {
                 .map(MageObject::getPower)
                 .mapToInt(MageInt::getValue)
                 .max()
-                .getAsInt();
+                .orElse(0);
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/t/TheGreatHenge.java b/Mage.Sets/src/mage/cards/t/TheGreatHenge.java
index ebe1cbfafe5..3c81dc3e097 100644
--- a/Mage.Sets/src/mage/cards/t/TheGreatHenge.java
+++ b/Mage.Sets/src/mage/cards/t/TheGreatHenge.java
@@ -91,8 +91,8 @@ class TheGreatHengeCostReductionEffect extends CostModificationEffectImpl {
                 .map(Permanent::getPower)
                 .mapToInt(MageInt::getValue)
                 .max()
-                .getAsInt();
-        CardUtil.reduceCost(abilityToModify, reductionAmount);
+                .orElse(0);
+        CardUtil.reduceCost(abilityToModify, Math.max(0, reductionAmount));
         return true;
     }