diff --git a/src/main/java/forge/deck/DeckManager.java b/src/main/java/forge/deck/DeckManager.java
index 189b117684a..2df9b2c3e1e 100644
--- a/src/main/java/forge/deck/DeckManager.java
+++ b/src/main/java/forge/deck/DeckManager.java
@@ -373,7 +373,7 @@ public class DeckManager {
 
         //readDeck comments
         String comment = null;
-        while ((line = iterator.next()) != null && !line.equals("[general]")) {
+        while (iterator.hasNext() && (line = iterator.next()) != null && !line.equals("[general]")) {
             if (comment == null) {
                 comment = line;
             } else {
@@ -382,7 +382,8 @@ public class DeckManager {
         }
 
         //readDeck deck type
-        GameType deckType = GameType.smartValueOf(iterator.next());
+        
+        GameType deckType = iterator.hasNext() ? GameType.smartValueOf(iterator.next()) : GameType.Constructed; 
 
         d.setName(name);
         d.setComment(comment);