--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java	Wed Jan 29 14:32:27 2014 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java	Thu Jan 30 07:35:49 2014 -0500
@@ -912,11 +912,7 @@
                         // not care about inner types.
                         JCAnnotatedType atypetree = (JCAnnotatedType) frame;
                         final Type utype = atypetree.underlyingType.type;
-                        if (utype == null) {
-                            // This might happen during DeferredAttr;
-                            // we will be back later.
-                            return;
-                        }
+                        Assert.checkNonNull(utype);
                         Symbol tsym = utype.tsym;
                         if (tsym.getKind().equals(ElementKind.TYPE_PARAMETER) ||
                                 utype.getKind().equals(TypeKind.WILDCARD) ||