diff --git a/Mage.Sets/src/mage/cards/p/PredatoryImpetus.java b/Mage.Sets/src/mage/cards/p/PredatoryImpetus.java
index 6ef24a6429e..76dcd0113f3 100644
--- a/Mage.Sets/src/mage/cards/p/PredatoryImpetus.java
+++ b/Mage.Sets/src/mage/cards/p/PredatoryImpetus.java
@@ -68,13 +68,12 @@ class PredatoryImpetusEffect extends RequirementEffect {
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
         Permanent attachment = game.getPermanent(source.getSourceId());
-        if (attachment != null && attachment.getAttachedTo() != null) {
-            Permanent attachedCreature = game.getPermanent(attachment.getAttachedTo());
-            if (attachedCreature != null && attachedCreature.isAttacking()) {
-                return permanent.canBlock(attachment.getAttachedTo(), game);
-            }
+        if (attachment == null || attachment.getAttachedTo() == null) {
+            return false;
         }
-        return false;
+        Permanent attachedCreature = game.getPermanent(attachment.getAttachedTo());
+        return attachedCreature != null && attachedCreature.isAttacking()
+                && permanent.canBlock(attachment.getAttachedTo(), game);
     }
 
     @Override
@@ -88,12 +87,9 @@ class PredatoryImpetusEffect extends RequirementEffect {
     }
 
     @Override
-    public UUID mustBlockAttacker(Ability source, Game game) {
+    public UUID mustBlockAttackerIfElseUnblocked(Ability source, Game game) {
         Permanent attachment = game.getPermanent(source.getSourceId());
-        if (attachment != null && attachment.getAttachedTo() != null) {
-            return attachment.getAttachedTo();
-        }
-        return null;
+        return attachment == null ? null : attachment.getAttachedTo();
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/common/GoadAttachedAbility.java b/Mage/src/main/java/mage/abilities/common/GoadAttachedAbility.java
index ec1ad4641dc..2111294b5e2 100644
--- a/Mage/src/main/java/mage/abilities/common/GoadAttachedAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/GoadAttachedAbility.java
@@ -25,7 +25,7 @@ public class GoadAttachedAbility extends StaticAbility {
         }
         this.addEffect(new AttacksIfAbleAttachedEffect(
                 Duration.WhileOnBattlefield, AttachmentType.AURA
-        ).setText(", and is goaded."));
+        ).setText(", and is goaded. "));
         this.addEffect(new GoadAttackEffect());
     }