diff --git a/res/cardsfolder/o/oblivion_ring.txt b/res/cardsfolder/o/oblivion_ring.txt
index f5545d63c26..53e44bb9132 100644
--- a/res/cardsfolder/o/oblivion_ring.txt
+++ b/res/cardsfolder/o/oblivion_ring.txt
@@ -4,8 +4,8 @@ Types:Enchantment
 Text:no text
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile another target nonland permanent.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled card to the battlefield under its owner's control.
-SVar:TrigExile:DB$ChangeZone | Cost$ 0 | TargetMin$ 1 | IsCurse$ True | ValidTgts$ Permanent.nonLand+Other | TgtPrompt$ Choose target nonland permanent other than Oblivion Ring | RememberTargets$ True | ForgetOtherTargets$ True | Origin$ Battlefield | Destination$ Exile
-SVar:TrigReturn:DB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
+SVar:TrigExile:DB$ ChangeZone | Cost$ 0 | TargetMin$ 1 | IsCurse$ True | ValidTgts$ Permanent.nonLand+Other | TgtPrompt$ Choose target nonland permanent other than Oblivion Ring | RememberTargets$ True | ForgetOtherTargets$ True | Origin$ Battlefield | Destination$ Exile
+SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card139414.jpg
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
index 73266837c65..9bab7797922 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
@@ -248,7 +248,6 @@ public final class AbilityFactoryChangeZone {
             return true;
         }
         
-        
         for (ZoneType z : zone) {
             if (z.isHidden()) {
                 return true;
@@ -2348,11 +2347,7 @@ public final class AbilityFactoryChangeZone {
 
         for (final Card c : list) {
             final Card actualCard = AllZoneUtil.getCardState(c);
-            if (actualCard != null) {
-                ret.add(actualCard);
-            } else {
-                ret.add(c);
-            }
+            ret.add(actualCard);
         }
         return ret;
     }