--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpression.java	Fri Jan 23 12:19:26 2015 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpression.java	Wed Feb 11 18:09:52 2015 +0100
@@ -233,10 +233,13 @@
 
         @Override
         public TypeMirror getResolvedType() {
+            if (resolvedMethod == null) {
+                return null;
+            }
             if (resolvedMethod.getKind() == ElementKind.CONSTRUCTOR) {
                 return resolvedMethod.getEnclosingElement().asType();
             } else {
-                return resolvedMethod != null ? resolvedMethod.getReturnType() : null;
+                return resolvedMethod.getReturnType();
             }
         }