--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Jun 19 23:52:33 2014 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java	Fri Jun 20 10:56:31 2014 -0600
@@ -2315,7 +2315,7 @@
             public Type visitType(Type t, Void ignored) {
                 // A note on wildcards: there is no good way to
                 // determine a supertype for a super bounded wildcard.
-                return null;
+                return Type.noType;
             }
 
             @Override
@@ -2482,7 +2482,7 @@
             return false;
         return
             t.isRaw() ||
-            supertype(t) != null && isDerivedRaw(supertype(t)) ||
+            supertype(t) != Type.noType && isDerivedRaw(supertype(t)) ||
             isDerivedRaw(interfaces(t));
     }