diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
index cbea2b34a69..1a3d8f35032 100644
--- a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
+++ b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
@@ -103,12 +103,6 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
             this.index = index0;
         }
 
-        @Override
-        public ColorSet getColor() {
-            // TODO Auto-generated method stub
-            return ColorSet.getNullColor();
-        }
-        
         @Override
         public String getName() {
             return name;
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java
index 51ed2f9b7c4..a2ceb016f27 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java
@@ -3,8 +3,9 @@ package forge.gui.toolbox.itemmanager.filters;
 import javax.swing.JPanel;
 
 import com.google.common.base.Predicate;
+
+import forge.card.ColorSet;
 import forge.card.MagicColor;
-import forge.deck.Deck;
 import forge.gui.deckeditor.DeckProxy;
 import forge.gui.toolbox.itemmanager.ItemManager;
 import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes;
@@ -80,43 +81,50 @@ public class DeckColorFilter extends StatTypeFilter<DeckProxy> {
     private static final Predicate<DeckProxy> IS_WHITE = new Predicate<DeckProxy>() {
         @Override
         public boolean apply(final DeckProxy deck) {
-            return deck.getColor().hasAnyColor(MagicColor.WHITE);
+            ColorSet cs = deck.getColor();
+            return cs != null && cs.hasAnyColor(MagicColor.WHITE);
         }
     };
     private static final Predicate<DeckProxy> IS_BLUE = new Predicate<DeckProxy>() {
         @Override
         public boolean apply(final DeckProxy deck) {
-            return deck.getColor().hasAnyColor(MagicColor.BLUE);
+            ColorSet cs = deck.getColor();
+            return cs != null && cs.hasAnyColor(MagicColor.BLUE);
         }
     };
     public static final Predicate<DeckProxy> IS_BLACK = new Predicate<DeckProxy>() {
         @Override
         public boolean apply(final DeckProxy deck) {
-            return deck.getColor().hasAnyColor(MagicColor.BLACK);
+            ColorSet cs = deck.getColor();
+            return cs != null && cs.hasAnyColor(MagicColor.BLACK);
         }
     };
     public static final Predicate<DeckProxy> IS_RED = new Predicate<DeckProxy>() {
         @Override
         public boolean apply(final DeckProxy deck) {
-            return deck.getColor().hasAnyColor(MagicColor.RED);
+            ColorSet cs = deck.getColor();
+            return cs != null && cs.hasAnyColor(MagicColor.RED);
         }
     };
     public static final Predicate<DeckProxy> IS_GREEN = new Predicate<DeckProxy>() {
         @Override
         public boolean apply(final DeckProxy deck) {
-            return deck.getColor().hasAnyColor(MagicColor.GREEN);
+            ColorSet cs = deck.getColor();
+            return cs != null && cs.hasAnyColor(MagicColor.GREEN);
         }
     };
     private static final Predicate<DeckProxy> IS_COLORLESS = new Predicate<DeckProxy>() {
         @Override
         public boolean apply(final DeckProxy deck) {
-            return deck.getColor().getColor() == 0;
+            ColorSet cs = deck.getColor();
+            return cs != null && cs.getColor() == 0;
         }
     };
     private static final Predicate<DeckProxy> IS_MULTICOLOR = new Predicate<DeckProxy>() {
         @Override
         public boolean apply(final DeckProxy deck) {
-            return BinaryUtil.bitCount(deck.getColor().getColor()) > 1;
+            ColorSet cs = deck.getColor();
+            return cs != null && BinaryUtil.bitCount(cs.getColor()) > 1;
         }
     };