diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
index 0eb770d4a3e..15e913a8ed0 100755
--- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
+++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
@@ -246,7 +246,7 @@ public class DomainFactoryImpl implements DomainFactory {
         synchronized (classCache) {
             BoatClass result = classCache.get(competitorClass);
             if (result == null) {
-                result = new BoatClassImpl(competitorClass.getName());
+                result = new BoatClassImpl(competitorClass == null ? "" : competitorClass.getName());
                 classCache.put(competitorClass, result);
             }
             return result;