diff --git a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
index c09f829ab8a..a7cf2a6ed5f 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
@@ -56,7 +56,7 @@ public class ConditionalTriggeredAbility extends TriggeredAbilityImpl<Conditiona
 
     @Override
     public String getRule() {
-        if (text != null && text.isEmpty()) {
+        if (text == null || text.isEmpty()) {
             return ability.getRule();
         }
         return text;
diff --git a/Mage/src/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java b/Mage/src/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java
index 093890196b4..531ed323c1b 100644
--- a/Mage/src/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java
+++ b/Mage/src/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java
@@ -40,7 +40,7 @@ import mage.players.Player;
 
 /**
  *
- * @author LevelX
+ * @author LevelX2
  */
 public class SkipNextPlayerUntapStepEffect extends OneShotEffect<SkipNextPlayerUntapStepEffect> {
 
@@ -82,7 +82,7 @@ public class SkipNextPlayerUntapStepEffect extends OneShotEffect<SkipNextPlayerU
         } else {
             sb.append("target");
         }
-        sb.append("player skips his or her next untap step");
+        sb.append(" player skips his or her next untap step");
         return sb.toString();
     }
 }