--- old/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	2016-12-21 15:51:37.253903057 -0500
+++ new/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	2016-12-21 15:51:36.707309634 -0500
@@ -90,6 +90,9 @@
         try (Scanner largeHeapScanner = new Scanner(
                 largeHeapProc.getInputStream());) {
             String pidstring = null;
+            if (!largeHeapScanner.hasNext()) {
+                throw new RuntimeException ("Test failed: could not open largeHeapScanner.");
+            }
             while ((pidstring = largeHeapScanner.findInLine("PID\\[[0-9].*\\]")) == null) {
                 Thread.sleep(500);
             }