--- a/jdk/src/share/classes/com/sun/tools/jdi/EventSetImpl.java	Tue Jul 01 09:23:00 2008 -0700
+++ b/jdk/src/share/classes/com/sun/tools/jdi/EventSetImpl.java	Wed Jul 02 09:37:42 2008 -0700
@@ -208,8 +208,9 @@
         }
 
         public String toString() {
-            return eventName() + "@" + location().toString() +
-                                 " in thread " + thread().name();
+            return eventName() + "@" +
+                   ((location() == null) ? " null" : location().toString()) +
+                   " in thread " + thread().name();
         }
     }