Index: subversion/bindings/javahl/native/JNIUtil.h
===================================================================
--- subversion/bindings/javahl/native/JNIUtil.h	(revision 1344562)
+++ subversion/bindings/javahl/native/JNIUtil.h	(working copy)
@@ -272,4 +272,12 @@
  */
 #define POP_AND_RETURN_NULL             POP_AND_RETURN(NULL)
 
+#define CPPADDR_NULL_PTR(expr, ret_val)                  \
+  do {                                                  \
+    if (expr == NULL) {                                 \
+    	JNIUtil::throwError(_("bad C++ this"));         \
+      return ret_val ;                                  \
+    }                                                   \
+  } while (0)
+
 #endif  // JNIUTIL_H