diff --git a/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java b/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java
index c8c8781542..b7d9bc0e3e 100644
--- a/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java
+++ b/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java
@@ -3,6 +3,7 @@ package mage.cards.o;
 import mage.MageInt;
 import mage.Mana;
 import mage.abilities.Ability;
+import mage.abilities.SpellAbility;
 import mage.abilities.common.DiesSourceTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
@@ -169,6 +170,10 @@ class OldGrowthTrollContinuousEffect extends ContinuousEffectImpl {
                 troll.addSubType(game, SubType.AURA);
                 break;
             case AbilityAddingRemovingEffects_6:
+                // Spell Ability can be null with clone effects (ex. Moritte)
+                if (troll.getSpellAbility() == null) {
+                    troll.addAbility(new SpellAbility(null, null), source.getSourceId(), game);
+                }
                 troll.getSpellAbility().getTargets().clear();
                 troll.getSpellAbility().getEffects().clear();
                 TargetPermanent auraTarget = new TargetPermanent(filter);
diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java
index 45959856c9..8bfcb3a40a 100644
--- a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java
@@ -36,6 +36,9 @@ public class ConditionalInterveningIfTriggeredAbility extends TriggeredAbilityIm
      */
     public ConditionalInterveningIfTriggeredAbility(TriggeredAbility ability, Condition condition, String text) {
         super(ability.getZone(), null);
+        if (ability.isLeavesTheBattlefieldTrigger()) {
+            this.setLeavesTheBattlefieldTrigger(true);
+        }
         this.ability = ability;
         this.condition = condition;
         this.abilityText = text;