From 66f785dd716506c76b64c49b6de095b268aab8f7 Mon Sep 17 00:00:00 2001
From: Styxo <ihnat.peter22@gmail.com>
Date: Sat, 3 Sep 2016 22:34:45 +0200
Subject: [PATCH] Fixed AddCountersTargetEffect

---
 .../counter/AddCountersTargetEffect.java      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java
index a19cd3cd21e..efe8af78ed2 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java
@@ -145,19 +145,23 @@ public class AddCountersTargetEffect extends OneShotEffect {
             sb.append("s");
         }
         sb.append(" on ");
-        
-        Target target = mode.getTargets().get(0);
-        if (target.getNumberOfTargets() == 0) {
-            sb.append("up to ");
-        }
 
-        if (target.getMaxNumberOfTargets() > 1 || target.getNumberOfTargets() == 0) {
-            sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName());
-        } else {
-            if (!target.getTargetName().startsWith("another")) {
-                sb.append("target ");
+        if (mode.getTargets().size() > 0) {
+            Target target = mode.getTargets().get(0);
+            if (target.getNumberOfTargets() == 0) {
+                sb.append("up to ");
             }
-            sb.append(target.getTargetName());
+
+            if (target.getMaxNumberOfTargets() > 1 || target.getNumberOfTargets() == 0) {
+                sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName());
+            } else {
+                if (!target.getTargetName().startsWith("another")) {
+                    sb.append("target ");
+                }
+                sb.append(target.getTargetName());
+            }
+        } else {
+            sb.append("that creature");
         }
 
         if (amount.getMessage().length() > 0) {