diff --git a/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java b/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java
index b664c9e230c..259f04e49c8 100644
--- a/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java
+++ b/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java
@@ -77,6 +77,7 @@ class DraugrNecromancerReplacementEffect extends ReplacementEffectImpl {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller == null
                 || permanent == null
+                || (permanent instanceof PermanentToken)
                 || !controller.hasOpponent(permanent.getControllerId(), game)) {
             return false;
         }
diff --git a/Mage.Sets/src/mage/cards/r/RayamiFirstOfTheFallen.java b/Mage.Sets/src/mage/cards/r/RayamiFirstOfTheFallen.java
index df3e0cade53..632e4463502 100644
--- a/Mage.Sets/src/mage/cards/r/RayamiFirstOfTheFallen.java
+++ b/Mage.Sets/src/mage/cards/r/RayamiFirstOfTheFallen.java
@@ -17,6 +17,7 @@ import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.PermanentToken;
 import mage.players.Player;
+import mage.util.CardUtil;
 
 import java.util.Collection;
 import java.util.UUID;
@@ -125,13 +126,12 @@ class RayamiFirstOfTheFallenReplacementEffect extends ReplacementEffectImpl {
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         Permanent permanent = ((ZoneChangeEvent) event).getTarget();
         Player controller = game.getPlayer(source.getControllerId());
-        if (controller == null || permanent == null) {
+        if (controller == null
+                || permanent == null
+                || (permanent instanceof PermanentToken)) {
             return false;
         }
-        controller.moveCards(permanent, Zone.EXILED, source, game);
-        Card card = game.getCard(permanent.getId());
-        card.addCounters(CounterType.BLOOD.createInstance(), source.getControllerId(), source, game);
-        return true;
+        return CardUtil.moveCardWithCounter(game, source, controller, permanent, Zone.EXILED, CounterType.BLOOD.createInstance());
     }
 
     @Override