diff --git a/forge-game/src/main/java/forge/game/card/ActivationTable.java b/forge-game/src/main/java/forge/game/card/ActivationTable.java
index 90b2adf640e..b292e5b2205 100644
--- a/forge-game/src/main/java/forge/game/card/ActivationTable.java
+++ b/forge-game/src/main/java/forge/game/card/ActivationTable.java
@@ -34,9 +34,12 @@ public class ActivationTable extends ForwardingTable<SpellAbility, Optional<Stat
     public void add(SpellAbility sa) {
         SpellAbility root = sa.getRootAbility();
         SpellAbility original = getOriginal(sa);
-        Optional<StaticAbility> st = Optional.fromNullable(root.getGrantorStatic());
 
-        delegate().put(original, st, ObjectUtils.defaultIfNull(get(original, st), 0) + 1);
+        if (original != null) {
+            Optional<StaticAbility> st = Optional.fromNullable(root.getGrantorStatic());
+
+            delegate().put(original, st, ObjectUtils.defaultIfNull(get(original, st), 0) + 1);
+        }
     }
 
     public Integer get(SpellAbility sa) {
diff --git a/forge-gui/res/cardsfolder/g/goblin_artisans.txt b/forge-gui/res/cardsfolder/g/goblin_artisans.txt
index e0f85b739a0..cd12095301f 100644
--- a/forge-gui/res/cardsfolder/g/goblin_artisans.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_artisans.txt
@@ -2,7 +2,8 @@ Name:Goblin Artisans
 ManaCost:R
 Types:Creature Goblin Artificer
 PT:1/1
-T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl | Origin$ Any | Destination$ Stack | RememberTriggeringCard
+T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl | Origin$ Any | Destination$ Stack | Execute$ DBRemember
+SVar:DBRemember:DB$ Pump | RememberObjects$ TriggeredCard
 T:Mode$ BecomesTarget | Static$ True | ValidSource$ Card.Other+namedGoblin Artisans | ValidTarget$ Spell | Execute$ DBForget
 SVar:DBForget:DB$ Cleanup | ForgetDefined$ TriggeredTargetHostCard
 T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl+IsRemembered | Origin$ Stack | Destination$ Any | Execute$ DBCleanup