diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java
index 5b06b565cf..607641a4ee 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java
@@ -22,7 +22,6 @@ import ghidra.program.database.register.InMemoryRangeMapAdapter;
 import ghidra.program.model.address.*;
 import ghidra.program.model.lang.*;
 import ghidra.program.model.listing.ContextChangeException;
-import ghidra.util.exception.AssertException;
 import ghidra.util.exception.CancelledException;
 import ghidra.util.task.TaskMonitor;
 
@@ -248,8 +247,9 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex
 	@Override
 	public void remove(Address start, Address end, Register register)
 			throws ContextChangeException {
-		if (start.getAddressSpace() != end.getAddressSpace()) {
-			throw new AssertException("start and end address must be in the same address space");
+		if (!start.getAddressSpace().equals(end.getAddressSpace())) {
+			throw new IllegalArgumentException(
+				"start and end address must be within the same address space");
 		}
 		RegisterValueStore values = registerValueMap.get(register.getBaseRegister());
 		if (values != null) {
@@ -259,8 +259,9 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex
 	}
 
 //	public void removeDefault(Address start, Address end, Register register) {
-//		if (start.getAddressSpace() != end.getAddressSpace()) {
-//			throw new AssertException("start and end address must be in the same address space");
+//		if (!start.getAddressSpace().equals(end.getAddressSpace())) {
+//			throw new IllegalArgumentException(
+//				"start and end address must be within the same address space");
 //		}
 //		invalidateCache();
 //		RegisterValueStore values = defaultRegisterValueMap.get(register.getBaseRegister());
@@ -272,8 +273,9 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex
 	@Override
 	public void setValue(Register register, Address start, Address end, BigInteger value)
 			throws ContextChangeException {
-		if (start.getAddressSpace() != end.getAddressSpace()) {
-			throw new AssertException("start and end address must be in the same address space");
+		if (!start.getAddressSpace().equals(end.getAddressSpace())) {
+			throw new IllegalArgumentException(
+				"start and end address must be within the same address space");
 		}
 		if (value == null) {
 			remove(start, end, register);
@@ -284,8 +286,9 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex
 
 	@Override
 	public void setDefaultValue(RegisterValue registerValue, Address start, Address end) {
-		if (start.getAddressSpace() != end.getAddressSpace()) {
-			throw new AssertException("start and end address must be in the same address space");
+		if (!start.getAddressSpace().equals(end.getAddressSpace())) {
+			throw new IllegalArgumentException(
+				"start and end address must be within the same address space");
 		}
 		Register baseRegister = registerValue.getRegister().getBaseRegister();
 		RegisterValueStore store = defaultRegisterValueMap.get(baseRegister);