diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java
index d83f066b64..bdc002a5c3 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java
@@ -332,7 +332,7 @@ public abstract class DemangledObject implements Demangled {
 			throw new DemangledException("Symbol did not demangle at address: " + address);
 		}
 		if (!address.isMemoryAddress() || !program.getMemory().contains(address)) {
-			throw new IllegalArgumentException("Invalid program memory address: " + address);
+			return true; // skip this symbol
 		}
 
 		String comment = program.getListing().getComment(CodeUnit.PLATE_COMMENT, address);
diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/demangler/DemangledFunctionTest.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/demangler/DemangledFunctionTest.java
index d3b1f81ddc..706cbe4344 100644
--- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/demangler/DemangledFunctionTest.java
+++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/demangler/DemangledFunctionTest.java
@@ -263,8 +263,7 @@ public class DemangledFunctionTest extends AbstractGhidraHeadlessIntegrationTest
 
 		String className =
 			"F<class_E::D::G<struct_E::D::H<bool_(__cdecl*const)(enum_C::B_const&),0>,bool,enum_C::B_const&>_>";
-		String functionName =
-			className + "<class_E::D::A<bool,enum_C::B_const&>_>";
+		String functionName = className + "<class_E::D::A<bool,enum_C::B_const&>_>";
 
 		Function function = assertFunction(functionName, addr);
 		assertNoBookmarkAt(addr);
@@ -294,7 +293,7 @@ public class DemangledFunctionTest extends AbstractGhidraHeadlessIntegrationTest
 	 * location symbol.
 	 */
 	@Test
-	public void testApply_ExtrnalFunctionInClassInNamespace() throws Exception {
+	public void testApply_ExternalFunctionInClassInNamespace() throws Exception {
 
 		// this is: public long __thiscall ATL::CRegKey::Close(void)
 		String mangled = "?Close@CRegKey@ATL@@QAEJXZ";