diff --git a/Mage.Sets/src/mage/cards/i/Icequake.java b/Mage.Sets/src/mage/cards/i/Icequake.java
index cad1b47cd1..70399b40e7 100644
--- a/Mage.Sets/src/mage/cards/i/Icequake.java
+++ b/Mage.Sets/src/mage/cards/i/Icequake.java
@@ -59,14 +59,16 @@ class IcequakeEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Player controller = game.getPlayer(source.getControllerId());
         Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
-        if (permanent != null && controller != null) {
-            permanent.destroy(source.getSourceId(), game, false);
-            if (permanent.isSnow()) {
-                controller.damage(1, source.getSourceId(), game, false, true);
+        if (permanent != null) {
+            Player controller = game.getPlayer(permanent.getControllerId());
+            if(controller != null) {
+                permanent.destroy(source.getSourceId(), game, false);
+                if (permanent.isSnow()) {
+                    controller.damage(1, source.getSourceId(), game, false, true);
+                }
+                return true;
             }
-            return true;
         }
         return false;
     }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/IcequakeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/IcequakeTest.java
new file mode 100644
index 0000000000..f3db7d6379
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/IcequakeTest.java
@@ -0,0 +1,25 @@
+package org.mage.test.cards.conditional;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+public class IcequakeTest extends CardTestPlayerBase {
+
+    @Test
+    public void testIcequakeOnSnowLand(){
+
+        addCard(Zone.BATTLEFIELD, playerB, "Snow-Covered Plains");
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp",10);
+        addCard(Zone.HAND, playerA, "Icequake");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN,playerA, "Icequake", "Snow-Covered Plains");
+
+        setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 19);
+    }
+}