--- old/src/share/bin/java.c	Fri Jan 10 16:47:30 2014
+++ new/src/share/bin/java.c	Fri Jan 10 16:47:30 2014
@@ -1233,7 +1233,7 @@
                 "checkAndLoadMain",
                 "(ZILjava/lang/String;)Ljava/lang/Class;"));
 
-    str = NewPlatformString(env, name);
+    NULL_CHECK0(str = NewPlatformString(env, name));
     result = (*env)->CallStaticObjectMethod(env, cls, mid, USE_STDERR, mode, str);
 
     if (JLI_IsTraceLauncher()) {
@@ -1521,7 +1521,7 @@
     NULL_CHECK(printHelp = (*env)->GetStaticMethodID(env, cls,
                                         "printHelpMessage", "(Z)V"));
 
-    jprogname = (*env)->NewStringUTF(env, _program_name);
+    NULL_CHECK(jprogname = (*env)->NewStringUTF(env, _program_name));
 
     /* Initialize the usage message with the usual preamble */
     (*env)->CallStaticVoidMethod(env, cls, initHelp, jprogname);
@@ -1530,21 +1530,21 @@
     /* Assemble the other variant part of the usage */
     if ((knownVMs[0].flag == VM_KNOWN) ||
         (knownVMs[0].flag == VM_IF_SERVER_CLASS)) {
-      vm1 = (*env)->NewStringUTF(env, knownVMs[0].name);
-      vm2 =  (*env)->NewStringUTF(env, knownVMs[0].name+1);
+      NULL_CHECK(vm1 = (*env)->NewStringUTF(env, knownVMs[0].name));
+      NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[0].name+1));
       (*env)->CallStaticVoidMethod(env, cls, vmSelect, vm1, vm2);
     }
     for (i=1; i<knownVMsCount; i++) {
       if (knownVMs[i].flag == VM_KNOWN) {
-        vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name);
-        vm2 =  (*env)->NewStringUTF(env, knownVMs[i].name+1);
+        NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name));
+        NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[i].name+1));
         (*env)->CallStaticVoidMethod(env, cls, vmSelect, vm1, vm2);
       }
     }
     for (i=1; i<knownVMsCount; i++) {
       if (knownVMs[i].flag == VM_ALIASED_TO) {
-        vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name);
-        vm2 =  (*env)->NewStringUTF(env, knownVMs[i].alias+1);
+        NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name));
+        NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[i].alias+1));
         (*env)->CallStaticVoidMethod(env, cls, vmSynonym, vm1, vm2);
       }
     }
@@ -1558,7 +1558,7 @@
         defaultVM = knownVMs[0].server_class+1;
       }
 
-      vm1 =  (*env)->NewStringUTF(env, defaultVM);
+      NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, defaultVM));
       (*env)->CallStaticVoidMethod(env, cls, vmErgo, isServerClassMachine,  vm1);
     }