diff --git a/rome-modules/src/test/java/com/rometools/modules/cc/types/LicenseTest.java b/rome-modules/src/test/java/com/rometools/modules/cc/types/LicenseTest.java
index 781fb5a..58ae6e4 100644
--- a/rome-modules/src/test/java/com/rometools/modules/cc/types/LicenseTest.java
+++ b/rome-modules/src/test/java/com/rometools/modules/cc/types/LicenseTest.java
@@ -23,11 +23,13 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.junit.Before;
 import org.junit.Test;
-
-import com.rometools.modules.cc.types.License;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LicenseTest {
 
+    private static final Logger LOG = LoggerFactory.getLogger(LicenseTest.class);
+
     @Before
     public void setUp() {
         // As the looked up licenses are held statically we need to clear this between tests.
@@ -54,6 +56,7 @@ public class LicenseTest {
                         }
                     }
                 } catch (final Exception e) {
+                    LOG.error("Exception in add-new thread", e);
                     hadException.set(true);
                 }
             }
@@ -66,12 +69,17 @@ public class LicenseTest {
                 final Random rnd = new Random();
                 try {
                     while (run.get()) {
+                        if (type.intValue() == 0) {
+                            continue;
+                        }
+
                         final License license = License.findByValue("http://creativecommons.org/licenses/" + rnd.nextInt(type.intValue()) + "/1");
                         if (license == null) {
                             hadProblem.set(true);
                         }
                     }
                 } catch (final Exception e) {
+                    LOG.error("Exception in get-existing thread", e);
                     hadException.set(true);
                 }
             }