--- old/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java	2016-04-25 14:50:50.000000000 -0700
+++ new/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java	2016-04-25 14:50:50.000000000 -0700
@@ -61,11 +61,11 @@
 
         Optional<Version> oversion = descriptor.version();
         if (oversion.isPresent())
-            cw.visitAttribute(new VersionAttribute(oversion.get()));
+            cw.visitAttribute(new VersionAttribute(oversion.getWhenPresent()));
 
         Optional<String> omain = descriptor.mainClass();
         if (omain.isPresent())
-            cw.visitAttribute(new MainClassAttribute(omain.get()));
+            cw.visitAttribute(new MainClassAttribute(omain.getWhenPresent()));
 
         // write the TargetPlatform attribute if have any of OS name/arch/version
         String osName = descriptor.osName().orElse(null);