From 824f53f019b1d65db03b87d8fb6c5a3c7dd8b128 Mon Sep 17 00:00:00 2001
From: Loki <loki@magefree>
Date: Thu, 14 Jul 2011 12:35:01 +0300
Subject: [PATCH] fix

---
 .../effects/common/ReturnToHandSourceEffect.java       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java b/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java
index 7b5a3197947..2ed7bb72500 100644
--- a/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java
@@ -60,15 +60,13 @@ public class ReturnToHandSourceEffect extends OneShotEffect<ReturnToHandSourceEf
         if (card != null) {
             switch (game.getZone(card.getId())) {
                 case BATTLEFIELD:
-                    if (card != null) {
-                        return card.moveToZone(Zone.HAND, source.getId(), game, false);
+                    Permanent p = game.getPermanent(source.getSourceId());
+                    if (p != null) {
+                        return p.moveToZone(Zone.HAND, source.getId(), game, false);
                     }
                     break;
                 case GRAVEYARD:
-                    if (card != null) {
-                        return card.moveToZone(Zone.HAND, source.getId(), game, true);
-                    }
-                    break;
+                    return card.moveToZone(Zone.HAND, source.getId(), game, true);
             }
         }
         return false;