diff --git a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java
index 7c50e7b0739..a25944f4cb8 100644
--- a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java
+++ b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java
@@ -28,33 +28,24 @@
 
 package mage.sets.worldwake;
 
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.constants.Zone;
+import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
+import mage.abilities.condition.common.OpponentControlsPermanentCondition;
 import mage.abilities.costs.CostImpl;
-import mage.abilities.costs.Costs;
-import mage.abilities.costs.CostsImpl;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.filter.common.FilterLandPermanent;
 import mage.game.Game;
 import mage.target.common.TargetNonBasicLandPermanent;
 
-import java.util.UUID;
-import mage.abilities.common.ActivateIfConditionActivatedAbility;
-import mage.abilities.condition.common.OpponentControllsMoreCondition;
-import mage.abilities.condition.common.OpponentControlsPermanentCondition;
-import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
-import mage.filter.common.FilterLandCard;
-import mage.target.common.TargetCardInLibrary;
-
 /**
  *
  * @author BetaSteward_at_googlemail.com
diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java b/Mage/src/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java
index 4f512a1c630..6c3b2e018c3 100644
--- a/Mage/src/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java
+++ b/Mage/src/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java
@@ -62,25 +62,22 @@ public class CantAttackUnlessDefenderControllsPermanent extends RestrictionEffec
         return permanent.getId().equals(source.getSourceId());
     }
 
-    @Override
-    public boolean canAttack(Game game) {
-        return false;
-    }
-
     @Override
     public boolean canAttack(UUID defenderId, Ability source, Game game) {
-        UUID defendingPlayerId = null;
+        UUID defendingPlayerId;
         Player player = game.getPlayer(defenderId);
         if (player == null) {
             Permanent permanent = game.getPermanent(defenderId);
             if (permanent != null) {
                 defendingPlayerId = permanent.getControllerId();
+            } else {
+                return false;
             }
         } else {
             defendingPlayerId = defenderId;
         }
         if (defendingPlayerId != null && game.getBattlefield().countAll(filter, defendingPlayerId, game) == 0) {
-            return true;
+            return false;
         }
         return true;
     }