diff --git a/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java
index 508ec8b876b..5dc8f993c6c 100644
--- a/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java
+++ b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java
@@ -28,6 +28,7 @@
 package mage.sets.theros;
 
 import java.util.UUID;
+import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.effects.AsThoughEffectImpl;
 import mage.abilities.effects.ContinuousEffect;
@@ -100,8 +101,9 @@ class PsychicIntrusionExileEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player opponent = game.getPlayer(targetPointer.getFirst(game, source));
-        if (opponent != null) {
-            opponent.revealCards("Psychic Intrusion", opponent.getHand(), game);
+        MageObject sourceObject = game.getObject(source.getSourceId());
+        if (opponent != null && sourceObject != null) {
+            opponent.revealCards(sourceObject.getLogName(), opponent.getHand(), game);
             Player controller = game.getPlayer(source.getControllerId());
             if (controller != null) {
                 int cardsGraveyard = opponent.getGraveyard().count(filter, game);
@@ -135,7 +137,7 @@ class PsychicIntrusionExileEffect extends OneShotEffect {
                 if (card != null) {
                     // move card to exile
                     UUID exileId = CardUtil.getCardExileZoneId(game, source);
-                    controller.moveCardToExileWithInfo(card, exileId,  "Psychic Intrusion",  source.getSourceId(), game, fromHand ? Zone.HAND:Zone.GRAVEYARD);
+                    controller.moveCardToExileWithInfo(card, exileId, sourceObject.getLogName(),  source.getSourceId(), game, fromHand ? Zone.HAND:Zone.GRAVEYARD);
                     // allow to cast the card
                     ContinuousEffect effect = new PsychicIntrusionCastFromExileEffect();
                     effect.setTargetPointer(new FixedTarget(card.getId()));
@@ -174,14 +176,17 @@ class PsychicIntrusionCastFromExileEffect extends AsThoughEffectImpl {
     }
 
     @Override
-    public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
-        if (sourceId.equals(getTargetPointer().getFirst(game, source))) {
-            if (game.getState().getZone(sourceId).equals(Zone.EXILED)) {
+    public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+        if (objectId.equals(getTargetPointer().getFirst(game, source))) {
+            if (affectedControllerId.equals(source.getControllerId())) {
                 return true;
-            } else {
-                discard();
+            }            
+        } else {
+            if (((FixedTarget)getTargetPointer()).getTarget().equals(objectId)) {
+                // object has moved zone so effect can be discarted
+                this.discard();
             }
-        }
+        }            
         return false;
     }
 }
@@ -208,12 +213,15 @@ class PsychicIntrusionSpendAnyManaEffect extends AsThoughEffectImpl {
     }
 
     @Override
-    public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
-        if (sourceId.equals(getTargetPointer().getFirst(game, source))) {
-            if (game.getState().getZone(sourceId).equals(Zone.EXILED)) {
+    public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+        if (objectId.equals(getTargetPointer().getFirst(game, source))) {
+            if (affectedControllerId.equals(source.getControllerId())) {
                 return true;
-            } else {
-                discard();
+            }            
+        } else {
+            if (((FixedTarget)getTargetPointer()).getTarget().equals(objectId)) {
+                // object has moved zone so effect can be discarted
+                this.discard();
             }
         }
         return false;
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java
new file mode 100644
index 00000000000..81184d0f114
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java
@@ -0,0 +1,74 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.continuous;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class PsychicIntrusionTest extends CardTestPlayerBase {
+
+    /**
+     * Tests that exiled card can be cast from Exile the next turn with any mana
+     */
+    @Test
+    public void testCastFromExile() {
+        // Psychic Intrusion  {3}{U}{B}
+        // Sorcery
+        // Target opponent reveals his or her hand. You choose a nonland card from that player's 
+        // graveyard or hand and exile it. You may cast that card for as long as it remains exiled,
+        // and you may spend mana as though it were mana of any color to cast that spell.
+        addCard(Zone.HAND, playerA, "Psychic Intrusion", 1);        
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
+        
+        addCard(Zone.HAND, playerB, "Elspeth, Sun's Champion", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Psychic Intrusion", playerB);
+        addTarget(playerA, "Elspeth, Sun's Champion");
+        
+        // cast from exile with any mana
+        castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Elspeth, Sun's Champion");
+        
+        setStopAt(3, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, "Psychic Intrusion", 1);
+        assertHandCount(playerB, "Elspeth, Sun's Champion", 0);
+        assertPermanentCount(playerA, "Elspeth, Sun's Champion", 1);
+
+    }
+
+
+}