diff --git a/src/share/classes/com/sun/tools/jdi/EventSetImpl.java b/src/share/classes/com/sun/tools/jdi/EventSetImpl.java
index 1a2c61c7bc94866110c10330f789f3c2e5fd455b..82a7c78085ae5ee94739f8267aa4ee0bd6de5698 100644
--- a/src/share/classes/com/sun/tools/jdi/EventSetImpl.java
+++ b/src/share/classes/com/sun/tools/jdi/EventSetImpl.java
@@ -208,8 +208,9 @@ public class EventSetImpl extends ArrayList<Event> implements EventSet {
         }
 
         public String toString() {
-            return eventName() + "@" + location().toString() +
-                                 " in thread " + thread().name();
+            return eventName() + "@" +
+                   ((location() == null) ? " null" : location().toString()) +
+                   " in thread " + thread().name();
         }
     }