diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java
index 4c6764e399..9d1732ee16 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java
@@ -369,11 +369,11 @@ public class ElfDefaultGotPltMarkup {
 			return; // evidence of prior markup - skip GOT processing
 		}
 
-		try {
-			// Fixup first GOT entry which frequently refers to _DYNAMIC but generally lacks relocation (e.g. .got.plt)
-			ElfDynamicTable dynamicTable = elf.getDynamicTable();
-			long imageBaseAdj = elfLoadHelper.getImageBaseWordAdjustmentOffset();
-			if (dynamicTable != null && imageBaseAdj != 0) {
+		// Fixup first GOT entry which frequently refers to _DYNAMIC but generally lacks relocation (e.g. .got.plt)
+		ElfDynamicTable dynamicTable = elf.getDynamicTable();
+		long imageBaseAdj = elfLoadHelper.getImageBaseWordAdjustmentOffset();
+		if (dynamicTable != null && imageBaseAdj != 0) {
+			try {
 				long entry1Value = elfLoadHelper.getOriginalValue(gotStart, false);
 				if (entry1Value == dynamicTable.getAddressOffset()) {
 					// TODO: record artificial relative relocation for reversion/export concerns
@@ -388,9 +388,17 @@ public class ElfDefaultGotPltMarkup {
 					}
 				}
 			}
+			catch (Exception e) {
+				String msg =
+					"Failed to process first GOT entry at " + gotStart + ": " + e.getMessage();
+				log(msg);
+				Msg.error(this, msg, e);
+			}
+		}
 
-			boolean imageBaseAlreadySet = elf.isPreLinked();
+		boolean imageBaseAlreadySet = elf.isPreLinked();
 
+		try {
 			Address newImageBase = null;
 			Address nextGotAddr = gotStart;
 			while (nextGotAddr.compareTo(gotEnd) <= 0) {
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
index 7d15af6b79..ef6be3969f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
@@ -979,17 +979,26 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
 
 	@Override
 	public long getOriginalValue(Address addr, boolean signExtend) throws MemoryAccessException {
-		byte[] bytes;
+		byte[] bytes = null;
 		int len = elf.is64Bit() ? 8 : 4;
 		List<Relocation> relocations = program.getRelocationTable().getRelocations(addr);
-		if (relocations.isEmpty()) {
+		for (Relocation r : relocations) {
+			bytes = r.getBytes();
+			if (bytes != null) {
+				if (bytes.length != len) {
+					// unsupported relocation length
+					throw new MemoryAccessException(
+						"Failed to identify " + len + " bytes from relocation at " + addr +
+							", was " + bytes.length + " bytes instead");
+				}
+				break;
+			}
+		}
+		if (bytes == null) {
 			bytes = new byte[len];
 			memory.getBytes(addr, bytes);
 		}
-		else {
-			// use bytes from first relocation
-			bytes = relocations.get(0).getBytes();
-		}
+
 		DataConverter dataConverter = DataConverter.getInstance(elf.isBigEndian());
 		return signExtend ? dataConverter.getSignedValue(bytes, len)
 				: dataConverter.getValue(bytes, len);