diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkProvider.java
index 1762179bf0..baed49e681 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkProvider.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkProvider.java
@@ -127,6 +127,9 @@ public class BookmarkProvider extends ComponentProviderAdapter {
 
 		BookmarkManager manager = program.getBookmarkManager();
 		Bookmark bookmark = manager.getBookmark(rowObject.getKey());
+		if (bookmark == null) {
+			return null;
+		}
 		Address address = bookmark.getAddress();
 		return new ProgramLocation(program, address);
 	}