diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java
index 19e8b45c4915d..9a13eb3dca518 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, 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
@@ -37,6 +37,7 @@
 import com.sun.jdi.Locatable;
 import com.sun.jdi.Location;
 import com.sun.jdi.Method;
+import com.sun.jdi.ObjectCollectedException;
 import com.sun.jdi.ObjectReference;
 import com.sun.jdi.ReferenceType;
 import com.sun.jdi.ThreadReference;
@@ -206,6 +207,19 @@ public String toString() {
 
     }
 
+    /* Safely fetch the thread name in case there is an ObjectCollectedException.
+     * This can happen when dealing with SUSPEND_NONE events.
+     */
+    private static String getThreadName(ThreadReference thread) {
+        String name;
+        try {
+            name = thread.name();
+        } catch (ObjectCollectedException oce) {
+            name = "<thread collected>";
+        }
+        return name;
+    }
+
     abstract class ThreadedEventImpl extends EventImpl {
         private ThreadReference thread;
 
@@ -220,7 +234,7 @@ public ThreadReference thread() {
         }
 
         public String toString() {
-            return eventName() + " in thread " + thread.name();
+            return eventName() + " in thread " + getThreadName(thread);
         }
     }
 
@@ -249,7 +263,7 @@ public Method method() {
         public String toString() {
             return eventName() + "@" +
                    ((location() == null) ? " null" : location().toString()) +
-                   " in thread " + thread().name();
+                   " in thread " + getThreadName(thread());
         }
     }
 
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 72a248408ac42..1d547faf662fd 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -715,7 +715,6 @@ javax/swing/plaf/synth/7158712/bug7158712.java 8324782 macosx-all
 # jdk_jdi
 
 com/sun/jdi/InvokeHangTest.java                                 8218463 linux-all
-com/sun/jdi/MethodInvokeWithTraceOnTest.java                    8373022 generic-all
 
 ############################################################################