diff --git a/bundles/com.zeligsoft.cx.codegen/src/com/zeligsoft/cx/codegen/internal/OawDebug.java b/bundles/com.zeligsoft.cx.codegen/src/com/zeligsoft/cx/codegen/internal/OawDebug.java
index 120f873bb..3359ffd14 100644
--- a/bundles/com.zeligsoft.cx.codegen/src/com/zeligsoft/cx/codegen/internal/OawDebug.java
+++ b/bundles/com.zeligsoft.cx.codegen/src/com/zeligsoft/cx/codegen/internal/OawDebug.java
@@ -182,7 +182,7 @@ public static String getNameOrId(Object obj) {
 					Object nameVal = eObj.eGet(attribute);
 					if (nameVal instanceof List) {
 						nameOrId = stringFromList((List)nameVal);
-					} else {
+					} else if (nameVal instanceof String) {
 						nameOrId = (String) nameVal.toString();
 					}
 					found = true;