--- old/src/share/bin/java.h	Wed May  1 12:23:12 2013
+++ new/src/share/bin/java.h	Wed May  1 12:23:12 2013
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -242,14 +242,13 @@
     InvocationFunctions ifn;
 } JavaMainArgs;
 
-#define NULL_CHECK0(e) if ((e) == 0) { \
+#define NULL_CHECK_RV(e, rv) if ((e) == 0) { \
     JLI_ReportErrorMessage(JNI_ERROR); \
-    return 0; \
+    return rv; \
   }
 
-#define NULL_CHECK(e) if ((e) == 0) { \
-    JLI_ReportErrorMessage(JNI_ERROR); \
-    return; \
-  }
+#define NULL_CHECK0(e) NULL_CHECK_RV(e, 0)
 
+#define NULL_CHECK(e) NULL_CHECK_RV(e, )
+
 #endif /* _JAVA_H_ */