diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/ColorMapImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/ColorMapImpl.java
index 0955c87a368..7faf8fc71a8 100755
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/ColorMapImpl.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/ColorMapImpl.java
@@ -55,10 +55,6 @@ public class ColorMapImpl<T> implements ColorMap<T> {
     /** a list of already used colors which should be excluded from the automatic color assignment */
     private List<HSVColor> blockedColors;
 
-    // public ColorMapImpl() {
-    // this(new ArrayList<Color>());
-    // }
-
     public ColorMapImpl(List<Color> initialBlockedColors) {
         baseColors = new HSVColor[11];
         idColor = new HashMap<>();
@@ -122,9 +118,11 @@ public class ColorMapImpl<T> implements ColorMap<T> {
     }
 
     public boolean addBlockedColor(Color color) {
-        boolean result = false;
-        if(color != null && !blockedColors.contains(color)) {
+        final boolean result;
+        if (color != null && !blockedColors.contains(color)) {
             result = blockedColors.add(convertFromColorToHSV(color));
+        } else {
+            result = false;
         }
         return result;
     }
diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ColorMapTest.java
similarity index 95%
rename from java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapTest.java
rename to java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ColorMapTest.java
index 59a72d1f66f..f7299635f09 100644
--- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ColorMapTest.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.ui.test;
+package com.sap.sailing.domain.common.test;
 
 import static org.junit.Assert.assertEquals;