diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java
index aadfe8455dc..73a03818265 100644
--- a/forge-core/src/main/java/forge/card/CardEdition.java
+++ b/forge-core/src/main/java/forge/card/CardEdition.java
@@ -431,7 +431,9 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
                 public Map<String, SealedProduct.Template> readAll() {
                     Map<String, SealedProduct.Template> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
                     for(CardEdition ce : Collection.this) {
-                         map.put(ce.getCode(), ce.getBoosterTemplate());
+                        if (ce.hasBoosterTemplate()) {
+                            map.put(ce.getCode(), ce.getBoosterTemplate());
+                        }
                     }
                     return map;
                 }
diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
index 7cfb8a36df9..c98678721c0 100644
--- a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
+++ b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
@@ -217,8 +217,11 @@ public class QuestUtilUnlockSets {
             cardsWon.addAll(booster.get());
         }
 
-        qData.getCards().addAllCards(cardsWon);
-        GuiBase.getInterface().showCardList(unlockedSet.getName(), "You get the following bonus cards:", cardsWon);
+        if (!cardsWon.isEmpty()) {
+            qData.getCards().addAllCards(cardsWon);
+            GuiBase.getInterface().showCardList(unlockedSet.getName(), "You get the following bonus cards:", cardsWon);
+        }
+
         qData.save();
     }
 }