diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorPanel.java
index a92971c9f4..6e0f4c1ca7 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorPanel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorPanel.java
@@ -118,7 +118,8 @@ public class CompEditorPanel extends CompositeEditorPanel {
 	@Override
 	public void compositeInfoChanged() {
 		adjustCompositeInfo();
-		if (model.showHexNumbers != bitViewComponent.isShowOffsetsInHex()) {
+		if (bitViewComponent != null &&
+			model.showHexNumbers != bitViewComponent.isShowOffsetsInHex()) {
 			bitViewComponent.setShowOffsetsInHex(model.showHexNumbers);
 		}
 	}