diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java
index c83e4c33f5..2b109d85c3 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java
@@ -938,12 +938,12 @@ public abstract class GhidraScript extends FlatProgramAPI {
 	 * Returns a demangled version of the mangled string.
 	 *
 	 * @param mangled the mangled string to demangled
-	 * @return a demangled version of the mangled string
+	 * @return a demangled version of the mangled string, or null if it could not be demangled
 	 */
 	public String getDemangled(String mangled) {
-		DemangledObject demangledObj = DemanglerUtil.demangle(mangled);
-		if (demangledObj != null) {
-			return demangledObj.getSignature(false);
+		List<DemangledObject> demangledObjs = DemanglerUtil.demangle(currentProgram, mangled, null);
+		if (!demangledObjs.isEmpty()) {
+			return demangledObjs.getFirst().getSignature(false);
 		}
 		return null;
 	}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerUtil.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerUtil.java
index d869d36432..e8e0624fc6 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerUtil.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerUtil.java
@@ -83,7 +83,7 @@ public class DemanglerUtil {
 	 * Deprecated.  Use {@link #demangle(Program, String, Address)}. See class header for more
 	 * details.
 	 *
-	 * Locates all available demanglers and checks to see if the supplied program is
+	 * <p>Locates all available demanglers and checks to see if the supplied program is
 	 * supported, then it attempts to demangle.
 	 *
 	 * <p>This method will use only the default options for demangling.  If you need to
@@ -131,9 +131,9 @@ public class DemanglerUtil {
 	 * {@link Demangler#createMangledContext(String, DemanglerOptions, Program, Address)} and
 	 * {@link Demangler#createDefaultOptions()}.
 	 *
-	 * @param program the program containing the mangled name
+	 * @param program the program containing the mangled name; can be null
 	 * @param mangled the mangled name
-	 * @param address the address of the mangled name
+	 * @param address the address of the mangled name; can be null
 	 * @return the list of {@link DemangledObject}
 	 */
 	public static List<DemangledObject> demangle(Program program, String mangled, Address address) {