diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java
index 4579981de5..ca3170e47b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java
@@ -285,7 +285,7 @@ public class AddressTable {
 			for (int k = 0; k < totalLen; k++) {
 				Data data = listing.getDataContaining(currentAddress.addWrap(k));
 				if (data == null ||
-					(!(data.isPointer() || data.getDataType() instanceof Undefined) &&
+					(!(data.isPointer() || Undefined.isUndefined(data.getDataType())) &&
 						data.isDefined())) {
 					return false;
 				}
@@ -1235,7 +1235,7 @@ public class AddressTable {
 				}
 
 				// undefined data is OK, could be a pointer
-				if (data.getDataType() instanceof Undefined) {
+				if (Undefined.isUndefined(data.getDataType())) {
 					continue;
 				}
 
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTableAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTableAnalyzer.java
index b86c9ce367..c17e057c1f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTableAnalyzer.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTableAnalyzer.java
@@ -322,7 +322,7 @@ public class AddressTableAnalyzer extends AbstractAnalyzer {
 		DataIterator definedData = program.getListing().getDefinedData(addrSet, true);
 		for (Data data : definedData) {
 			DataType dataType = data.getDataType();
-			if (dataType instanceof Undefined) {
+			if (Undefined.isUndefined(dataType)) {
 				continue;
 			}