diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 685ad9f367d..28d3d15a7c8 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -3763,8 +3763,12 @@ public class CardFactoryUtil {
             final SpellAbility origSA = card.getFirstSpellAbility();
 
             // append to original SA
-            origSA.appendSubAbility(newSA);            
+            origSA.appendSubAbility(newSA);
         } else if (keyword.startsWith("Equip")) {
+            if (!keyword.contains(":")) {
+                System.err.println("Malformed Equip entry! - Card: " + card.toString());
+                return;
+            }
             String[] k = keyword.split(":");
             // Get cost string
             String equipCost = k[1];
diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java
index 3f162073386..217115efe5a 100644
--- a/forge-gui/src/main/java/forge/deck/DeckImportController.java
+++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java
@@ -72,7 +72,7 @@ public class DeckImportController {
         }
 
         final Deck result = new Deck();
-        DeckSection deckSection = null;
+        DeckSection deckSection = DeckSection.Main;
         String section = "";
         for (final DeckRecognizer.Token t : tokens) {
             final DeckRecognizer.TokenType type = t.getType();