diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
index f2134955c11..56bea0c8c92 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
@@ -455,6 +455,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                 ColumnDef groupPileBy = groupBy == null ? pileBy : groupBy.getGroupPileBy(i, pileBy);
                 Map<Comparable<?>, Pile> piles = new TreeMap<>();
                 for (ItemInfo itemInfo : group.items) {
+                    if (itemInfo == null)
+                        continue;
                     Comparable<?> key = groupPileBy.fnSort.apply(itemInfo);
                     if (key != null && !piles.containsKey(key)) {
                         piles.put(key, new Pile());
diff --git a/forge-gui/res/cardsfolder/upcoming/the_clone_saga.txt b/forge-gui/res/cardsfolder/upcoming/the_clone_saga.txt
index 89b6d7d757d..583493de493 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_clone_saga.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_clone_saga.txt
@@ -6,7 +6,7 @@ SVar:DBSurveil:DB$ Surveil | Amount$ 3 | SpellDescription$ Surveil 3.
 SVar:DBCopyEffect:DB$ DelayedTrigger | Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | ThisTurn$ True | Execute$ EffTrigCopy | SpellDescription$ When you next cast a creature spell this turn, copy it, except the copy isn't legendary.
 SVar:EffTrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | NonLegendary$ True
 SVar:DBDrawEffect:DB$ NameCard | Defined$ You | SubAbility$ DBEffect | SpellDescription$ Choose a card name. Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
-SVar:DBEffect:DB$ Effect | Triggers$ DamageTrigger
+SVar:DBEffect:DB$ Effect | Triggers$ TrigDamage
 SVar:TrigDamage:Mode$ DamageDone | ValidSource$ Creature.NamedCard | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
 SVar:TrigDraw:DB$ Draw
 Oracle:(As this Saga enters step, add a lore counter. Sacrifice after III.)\nI — Surveil 3.\nII — When you next cast a creature spell this turn, copy it, except the copy isn't legendary.\nIII — Choose a card name. Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.