diff --git a/forge-gui/src/main/java/forge/quest/QuestEventDraft.java b/forge-gui/src/main/java/forge/quest/QuestEventDraft.java
index 15710b1e118..4511d0b98ac 100644
--- a/forge-gui/src/main/java/forge/quest/QuestEventDraft.java
+++ b/forge-gui/src/main/java/forge/quest/QuestEventDraft.java
@@ -747,9 +747,16 @@ public class QuestEventDraft {
      * @return The created draft or null in the event no draft could be created.
      */
     public static QuestEventDraft getRandomDraftOrNull(final QuestController quest) {
+        
         List<CardBlock> possibleBlocks = getAvailableBlocks(quest);
+        
+        if (possibleBlocks == null) {
+            return null;
+        }
+        
         Collections.shuffle(possibleBlocks);
         return getDraftOrNull(quest, possibleBlocks.get(0));
+        
     }
 
     /**