diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java
index <HASH>..<HASH> 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java
@@ -22,6 +22,8 @@ public class ClasspathUriUtil {
     public static final String CLASSPATH_SCHEME = "classpath";
 
     public static boolean isClasspathUri(URI uri) {
+    	if (uri == null)
+    		return false;
         String scheme = uri.scheme();
         return CLASSPATH_SCHEME.equals(scheme);
     }
[Xbase] introduced JvmModelCompleter to complete a JvmModel according to Java defaults.