diff --git a/src/magic/card/Wall_of_Frost.java b/src/magic/card/Wall_of_Frost.java
index cfd9c33296..ecb1b69bcf 100644
--- a/src/magic/card/Wall_of_Frost.java
+++ b/src/magic/card/Wall_of_Frost.java
@@ -11,18 +11,15 @@ public class Wall_of_Frost {
     public static final MagicWhenBlocksTrigger T = new MagicWhenBlocksTrigger() {
 		@Override
 		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent data) {
-			if (permanent==data) {
-				final MagicPermanent blocked=permanent.getBlockedCreature();
-				if (blocked!=null) {
-					return new MagicEvent(
-                            permanent,
-                            permanent.getController(),
-                            new Object[]{blocked},
-                            this,
-                            blocked+" doesn't untap during its controller's next untap step.");
-				}
-			}
-			return null;
+            final MagicPermanent blocked=permanent.getBlockedCreature();
+			return (permanent==data && blocked!=MagicPermanent.NONE) ?
+                new MagicEvent(
+                    permanent,
+                    permanent.getController(),
+                    new Object[]{blocked},
+                    this,
+                    blocked+" doesn't untap during its controller's next untap step."):
+                null;
 		}
 		@Override
 		public void executeEvent(