--- a/hotspot/src/share/vm/utilities/ostream.cpp	Tue Mar 15 13:48:21 2016 -0700
+++ b/hotspot/src/share/vm/utilities/ostream.cpp	Thu Mar 17 19:04:01 2016 +0000
@@ -706,8 +706,10 @@
       for (SystemProperty* p = Arguments::system_properties(); p != NULL; p = p->next()) {
         // Print in two stages to avoid problems with long
         // keys/values.
+        assert(p->key() != NULL, "p->key() is NULL");
         text->print_raw(p->key());
         text->put('=');
+        assert(p->value() != NULL, "p->value() is NULL");
         text->print_raw_cr(p->value());
       }
       xs->tail("properties");