--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java	Wed Jul 27 07:07:10 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java	Thu Jul 28 10:13:34 2016 +0530
@@ -757,7 +757,9 @@
 
         @Override
         public void visitRequires(JCRequires tree) {
-            msym.directives = msym.directives.prepend(tree.directive);
+            if (tree.directive != null) {
+                msym.directives = msym.directives.prepend(tree.directive);
+            }
         }
 
         @Override
@@ -1214,9 +1216,9 @@
 
     private void checkCyclicDependencies(JCModuleDecl mod) {
         for (JCDirective d : mod.directives) {
-            if (!d.hasTag(Tag.REQUIRES))
+            JCRequires rd;
+            if (!d.hasTag(Tag.REQUIRES) || (rd = (JCRequires) d).directive == null)
                 continue;
-            JCRequires rd = (JCRequires) d;
             Set<ModuleSymbol> nonSyntheticDeps = new HashSet<>();
             List<ModuleSymbol> queue = List.of(rd.directive.module);
             while (queue.nonEmpty()) {