diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
index 0a35e1353..d5f95592e 100644
--- a/src/debugAdapter/goDebug.ts
+++ b/src/debugAdapter/goDebug.ts
@@ -639,7 +639,7 @@ class GoDebugSession extends DebugSession {
 		}).then(newBreakpoints => {
 			// Unwrap breakpoints from v2 apicall
 			let adaptedBreakpoints = newBreakpoints.map((bp, i) => {
-				return bp.Breakpoint;
+				return  bp ? bp.Breakpoint : null;
 			});
 			let breakpoints = adaptedBreakpoints.map((bp, i) => {
 				if (bp) {