diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java
new file mode 100644
index 00000000000..d68481c0143
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java
@@ -0,0 +1,77 @@
+/*
+ *  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 mage.sets.riseoftheeldrazi;
+
+import java.util.UUID;
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.abilities.Ability;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+import mage.abilities.common.AttacksOrBlocksEnchantedTriggeredAbility;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class LuminousWake extends CardImpl<LuminousWake> {
+
+    public LuminousWake(UUID ownerId) {
+        super(ownerId, 35, "Luminous Wake", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}");
+        this.expansionSetCode = "ROE";
+        this.subtype.add("Aura");
+
+        this.color.setWhite(true);
+
+        // Enchant creature
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+        
+        // Whenever enchanted creature attacks or blocks, you gain 4 life.
+        Ability ability2 = new AttacksOrBlocksEnchantedTriggeredAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(4));
+        this.addAbility(ability2);
+    }
+
+    public LuminousWake(final LuminousWake card) {
+        super(card);
+    }
+
+    @Override
+    public LuminousWake copy() {
+        return new LuminousWake(this);
+    }
+}
+
diff --git a/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java
new file mode 100644
index 00000000000..c7823443b48
--- /dev/null
+++ b/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java
@@ -0,0 +1,42 @@
+// @author jeffwadsworth
+
+package mage.abilities.common;
+
+import mage.Constants;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+
+public class AttacksOrBlocksEnchantedTriggeredAbility extends TriggeredAbilityImpl<AttacksOrBlocksEnchantedTriggeredAbility> {
+
+    public AttacksOrBlocksEnchantedTriggeredAbility(Constants.Zone zone, Effect effect) {
+        super(zone, effect);
+    }
+
+    public AttacksOrBlocksEnchantedTriggeredAbility(final AttacksOrBlocksEnchantedTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public AttacksOrBlocksEnchantedTriggeredAbility copy() {
+        return new AttacksOrBlocksEnchantedTriggeredAbility(this);
+    }
+    
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent enchantment = game.getPermanent(this.getSourceId());
+         if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED || event.getType() == GameEvent.EventType.BLOCKER_DECLARED) {
+            if (enchantment != null && event.getSourceId().equals(enchantment.getAttachedTo())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever enchanted creature attacks or blocks, "+ super.getRule();
+    }
+}
diff --git a/Mage/src/mage/abilities/condition/common/ControlsBiggestOrTiedCreatureCondition.java b/Mage/src/mage/abilities/condition/common/ControlsBiggestOrTiedCreatureCondition.java
index d1b793a9f4e..2b6adc785d5 100644
--- a/Mage/src/mage/abilities/condition/common/ControlsBiggestOrTiedCreatureCondition.java
+++ b/Mage/src/mage/abilities/condition/common/ControlsBiggestOrTiedCreatureCondition.java
@@ -55,11 +55,13 @@ public class ControlsBiggestOrTiedCreatureCondition implements Condition {
         UUID controller = null;
         int maxPower = -1;
         for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, game)) {
-            if (maxPower == -1 || permanent.getPower().getValue() >= maxPower) {
-                maxPower = permanent.getPower().getValue();
-                controller = (permanent.getControllerId());
+            if (permanent != null) {
+                if (maxPower == -1 || permanent.getPower().getValue() >= maxPower) {
+                    maxPower = permanent.getPower().getValue();
+                    controller = (permanent.getControllerId());
+                }
             }
         }
-        return controller.equals(source.getControllerId());
+        return controller != null && controller.equals(source.getControllerId());
     }
 }