--- old/test/jdk/valhalla/valuetypes/NonFlattenValue.java	2019-05-15 13:58:14.127886228 -0400
+++ new/test/jdk/valhalla/valuetypes/NonFlattenValue.java	2019-05-15 13:58:13.759884404 -0400
@@ -25,8 +25,7 @@
     Point? nfp;
 
     NonFlattenValue() {
-        Point p = Point.makePoint(0,0);
-        this.nfp = p;
+        this.nfp = Point.makePoint(0,0);
     }
     public Point? point() {
         return nfp;
@@ -47,6 +46,7 @@
 
     @Override
     public String toString() {
-        return nfp.toString();
+        // nfp may be null when NonFlattenValue[] is created and filled with default value
+        return nfp != null ? nfp.toString() : "default NonFlattenValue";
     }
 }