--- old/src/java.base/share/classes/jdk/internal/module/Builder.java	Tue Mar  8 21:59:21 2016
+++ new/src/java.base/share/classes/jdk/internal/module/Builder.java	Tue Mar  8 21:59:20 2016
@@ -193,7 +193,8 @@
      */
     public Builder version(String v) {
         if (version != null)
-            throw new IllegalStateException("module version already set");
+            throw new IllegalStateException(
+                "module version already set: " + version);
         Version ver = cachedVersion;
         if (ver != null && v.equals(ver.toString())) {
             version = ver;
@@ -210,7 +211,8 @@
      */
     public Builder mainClass(String mc) {
         if (mainClass != null)
-            throw new IllegalStateException("main class already set");
+            throw new IllegalStateException(
+                "main class already set: " + mainClass);
         mainClass = mc;
         return this;
     }
@@ -222,7 +224,8 @@
      */
     public Builder osName(String name) {
         if (osName != null)
-            throw new IllegalStateException("OS name already set");
+            throw new IllegalStateException(
+                "OS name already set: " + osName);
         this.osName = name;
         return this;
     }
@@ -234,7 +237,8 @@
      */
     public Builder osArch(String arch) {
         if (osArch != null)
-            throw new IllegalStateException("OS arch already set");
+            throw new IllegalStateException(
+                "OS arch already set: " + osArch);
         this.osArch = arch;
         return this;
     }
@@ -246,7 +250,8 @@
      */
     public Builder osVersion(String version) {
         if (osVersion != null)
-            throw new IllegalStateException("OS version already set");
+            throw new IllegalStateException(
+                "OS version already set: " + osVersion);
         this.osVersion = version;
         return this;
     }