From bd1d97408d6c4ff4aac7cb0fff8f7d7ea39f0e80 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Wed, 24 Jun 2026 17:24:40 -0400
Subject: [PATCH] GP-6969 - Fixed NPE double-clicking on an offcut label

---
 .../app/util/viewer/field/LabelFieldMouseHandler.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/LabelFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/LabelFieldMouseHandler.java
index 98d9c2f9f8..15df2eb314 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/LabelFieldMouseHandler.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/LabelFieldMouseHandler.java
@@ -76,8 +76,11 @@ public class LabelFieldMouseHandler implements FieldMouseHandlerExtension {
 		Address addr = location.getAddress();
 		Program program = location.getProgram();
 		Listing listing = program.getListing();
-		CodeUnit cu = listing.getCodeUnitAt(addr);
-		service.showSymbols(cu);
+		CodeUnit cu = listing.getCodeUnitContaining(addr);
+		if (cu != null) {
+			service.showSymbols(cu);
+			return;
+		}
 	}
 
 	private String getText(Object clickedObject) {