--- old/test/hotspot/jtreg/runtime/RedefineTests/ModifyAnonymous.java	2018-08-31 11:18:54.169827795 -0700
+++ new/test/hotspot/jtreg/runtime/RedefineTests/ModifyAnonymous.java	2018-08-31 11:18:53.830795771 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -109,7 +109,14 @@
     static void runTest() {
         while (!done) {
             Class[] allLoadedClasses = inst.getAllLoadedClasses();
-            for (Class clazz : allLoadedClasses) {
+            int len = allLoadedClasses.length;
+            for (int idx = 0; idx < len; idx++) {
+                Class clazz = allLoadedClasses[idx];
+                if (clazz == null) {
+                    System.out.println("    null clazz, allLoadedClasses[] length: " +
+                        len + " index: "  + idx);
+                    continue;
+                }
                 final String name = clazz.getName();
                 if (name.contains("$$Lambda$") && name.contains("App")) {
                     if (inst.isModifiableClass(clazz)) {