diff --git a/Mage.Sets/src/mage/cards/c/CaseOfThePilferedProof.java b/Mage.Sets/src/mage/cards/c/CaseOfThePilferedProof.java
index f8504b53ac2..bbaf413f149 100644
--- a/Mage.Sets/src/mage/cards/c/CaseOfThePilferedProof.java
+++ b/Mage.Sets/src/mage/cards/c/CaseOfThePilferedProof.java
@@ -137,8 +137,17 @@ class CaseOfThePilferedProofReplacementEffect extends ReplacementEffectImpl {
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         if (event instanceof CreateTokenEvent) {
             CreateTokenEvent tokenEvent = (CreateTokenEvent) event;
+            ClueArtifactToken clueToken = null;
             Map<Token, Integer> tokens = tokenEvent.getTokens();
-            tokens.put(new ClueArtifactToken(), 1);
+            for (Map.Entry<Token, Integer> entry : tokens.entrySet()) {
+                if (entry.getKey() instanceof ClueArtifactToken) {
+                    clueToken = (ClueArtifactToken) entry.getKey();
+                }
+            }
+            if (clueToken == null) {
+                clueToken = new ClueArtifactToken();
+            }
+            tokens.put(clueToken, tokens.getOrDefault(clueToken, 0) + 1);
         }
         return false;
     }
diff --git a/Mage/src/main/java/mage/abilities/common/CaseAbility.java b/Mage/src/main/java/mage/abilities/common/CaseAbility.java
index 8ec1b5f3389..929853b83ac 100644
--- a/Mage/src/main/java/mage/abilities/common/CaseAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/CaseAbility.java
@@ -88,12 +88,12 @@ public class CaseAbility extends SimpleStaticAbility {
                     if (!(effect instanceof ConditionalContinuousEffect ||
                             effect instanceof ConditionalAsThoughEffect ||
                             effect instanceof ConditionalReplacementEffect)) {
-                        throw new IllegalArgumentException("solvedAbility must be one of ConditionalActivatedAbility, " +
+                        throw new IllegalArgumentException("Wrong code usage: solvedAbility must be one of ConditionalActivatedAbility, " +
                                 "ConditionalTriggeredAbility, or StaticAbility with conditional effects.");
                     }
                 }
             } else {
-                throw new IllegalArgumentException("solvedAbility must be one of ConditionalActivatedAbility, " +
+                throw new IllegalArgumentException("Wrong code usage: solvedAbility must be one of ConditionalActivatedAbility, " +
                         "ConditionalTriggeredAbility, or StaticAbility with conditional effects.");
             }
         }