1 files changed, 8 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugEventHelper.java b/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugEventHelper.java
index 0254484062..a389569bc2 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugEventHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugEventHelper.java
@@ -159,11 +159,14 @@ final class DebugEventHelper {
   }
 
   static SkylarkDebuggingProtos.Frame getFrameProto(DebugFrame frame) {
-    return SkylarkDebuggingProtos.Frame.newBuilder()
-        .setFunctionName(frame.functionName())
-        .setLocation(getLocationProto(frame.location()))
-        .addAllScope(getScopes(frame))
-        .build();
+    SkylarkDebuggingProtos.Frame.Builder builder =
+        SkylarkDebuggingProtos.Frame.newBuilder()
+            .setFunctionName(frame.functionName())
+            .addAllScope(getScopes(frame));
+    if (frame.location() != null) {
+      builder.setLocation(getLocationProto(frame.location()));
+    }
+    return builder.build();
   }
 
   private static ImmutableList<Scope> getScopes(DebugFrame frame) {