diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
index d0fcd49cf7..02cfe326b7 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
@@ -685,11 +685,11 @@ public class MachoProgramBuilder {
 				int symbolIndex = indirectSymbols.get(i);
 				NList symbol = symbolTableCommand.getSymbolAt(symbolIndex);
 				String name = null;
-				if (symbol != null) {
+				if (symbol != null && !symbol.getString().isBlank()) {
 					name = SymbolUtilities.replaceInvalidChars(symbol.getString(), true);
 				}
 				Function stubFunc = createOneByteFunction(program, name, startAddr);
-				if (stubFunc != null && symbol != null) {
+				if (stubFunc != null && name != null) {
 					ExternalLocation loc = program.getExternalManager()
 							.addExtLocation(Library.UNKNOWN, name, null, SourceType.IMPORTED);
 					stubFunc.setThunkedFunction(loc.createFunction());
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractFunctionTypeApplier.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractFunctionTypeApplier.java
index 7ec1ca357d..bc5d7336a7 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractFunctionTypeApplier.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractFunctionTypeApplier.java
@@ -287,6 +287,9 @@ public abstract class AbstractFunctionTypeApplier extends MsDataTypeApplier {
 		RecordNumber argsRecord = getArgListRecordNumber(type);
 		AbstractMsType aType = applicator.getTypeRecord(argsRecord);
 		if (!(aType instanceof AbstractArgumentsListMsType argsList)) {
+			if (aType instanceof PrimitiveMsType pt && pt.isNoType()) {
+				return new ArrayList<>();
+			}
 			throw new PdbException(
 				"Expecting arguments list but got: " + aType.getClass().getSimpleName());
 		}
diff --git a/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties b/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties
index 2a84e188b8..2e1113280e 100644
--- a/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties
+++ b/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME