diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/objectteams/otdt/internal/core/compiler/util/RoleTypeCreator.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/objectteams/otdt/internal/core/compiler/util/RoleTypeCreator.java
index 5d54580..418e50f 100644
--- a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/objectteams/otdt/internal/core/compiler/util/RoleTypeCreator.java
+++ b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/objectteams/otdt/internal/core/compiler/util/RoleTypeCreator.java
@@ -603,13 +603,13 @@
 	        } else if (!variableBinding.isFinal()) {
 	            if (problemReporter != null)
 	                problemReporter.anchorPathNotFinal(null, variableBinding, refBinding.sourceName()); // TODO
-	            return null;
+	            return originalType;
 	        } else if (   !(variableBinding instanceof TThisBinding)
 	        		   && !refBinding.isPublic())
 	        {
 	        	if (problemReporter != null)
 	        		problemReporter.externalizingNonPublicRole(typedNode, refBinding);
-	            return null;
+	            return originalType;
 	        }
 
 	        // delegate to the principal function: