diff --git a/Mage.Sets/src/mage/cards/c/Cagemail.java b/Mage.Sets/src/mage/cards/c/Cagemail.java
index 35107c3a6e..78100ca050 100644
--- a/Mage.Sets/src/mage/cards/c/Cagemail.java
+++ b/Mage.Sets/src/mage/cards/c/Cagemail.java
@@ -40,6 +40,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
+import mage.abilities.effects.Effect;
 
 /**
  *
@@ -59,8 +60,11 @@ public class Cagemail extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
         // Enchanted creature gets +2/+2 and can't block.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)));
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttachedEffect(AttachmentType.AURA)));
+        Ability ability1 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield));
+        Effect effect = new CantBlockAttachedEffect(AttachmentType.AURA);
+        effect.setText("and can't block.");
+        ability1.addEffect(effect);
+        this.addAbility(ability1);
     }
 
     public Cagemail(final Cagemail card) {
diff --git a/Mage.Sets/src/mage/cards/w/WallOfPutridFlesh.java b/Mage.Sets/src/mage/cards/w/WallOfPutridFlesh.java
index bf246ed7fb..9e026a1f6a 100644
--- a/Mage.Sets/src/mage/cards/w/WallOfPutridFlesh.java
+++ b/Mage.Sets/src/mage/cards/w/WallOfPutridFlesh.java
@@ -99,7 +99,7 @@ class PreventDamageToSourceByEnchantedCreatures extends PreventAllDamageToSource
     }
 
     public boolean isEnchantedCreature(MageObject input, Game game) {
-        if (!input.getCardType().contains(CardType.CREATURE)) {
+        if (input != null && !input.getCardType().contains(CardType.CREATURE)) {
             return false;
         }
         for (UUID attachmentId : ((Permanent)input).getAttachments()) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessPaysAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessPaysAttachedEffect.java
index 4bbb375426..5dee2cc0b1 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessPaysAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessPaysAttachedEffect.java
@@ -45,7 +45,7 @@ import mage.game.permanent.Permanent;
 public class CantAttackUnlessPaysAttachedEffect extends PayCostToAttackBlockEffectImpl {
 
     public CantAttackUnlessPaysAttachedEffect(ManaCosts manaCosts, AttachmentType attachmentType) {
-        super(Duration.WhileOnBattlefield, Outcome.Detriment, RestrictType.ATTACK_AND_BLOCK, manaCosts);
+        super(Duration.WhileOnBattlefield, Outcome.Detriment, RestrictType.ATTACK, manaCosts);
         staticText = (attachmentType.equals(AttachmentType.AURA) ? "Enchanted " : "Equipped ")
                 + "creature can't attack unless its controller pays "
                 + (manaCosts == null ? "" : manaCosts.getText());