diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
index 8ad0c87313..f74c604142 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
@@ -456,6 +456,9 @@ public class ServerAdmin implements GhidraLaunchable {
 			Msg.error(CommandProcessor.class, "Repository not found: " + repName);
 			System.exit(-1);
 		}
+		if (repName.contains(" ")) {
+			args[i] = "\"" + repName + "\"";
+		}
 	}
 
 	/**
diff --git a/Ghidra/RuntimeScripts/Common/support/launch.properties b/Ghidra/RuntimeScripts/Common/support/launch.properties
index 6db1bd3923..727af65fd7 100644
--- a/Ghidra/RuntimeScripts/Common/support/launch.properties
+++ b/Ghidra/RuntimeScripts/Common/support/launch.properties
@@ -36,6 +36,17 @@ VMARGS=-Djdk.tls.client.protocols=TLSv1.2,TLSv1.3
 # specifying path to installed CA certificates file.
 # VMARGS=-Dghidra.cacerts=
 
+# Enable verbose logging for network SSL/TLS negotiations.
+# This can be very useful when troubleshooting SSLHandshakeException failures which can 
+# manifest with very cryptic messages.  All Ghidra Server communications rely on secure
+# SSL/TLS connections.  This VMARG should only be uncommented while actively troubleshooting
+# since it will log a significant amount of data.
+#
+# See the "Troubleshoting JSSE" section of the following internet hosted document:
+#   https://docs.oracle.com/en/java/javase/17/security/java-secure-socket-extension-jsse-reference-guide.html
+#  
+#VMARGS=-Djavax.net.debug=ssl
+
 # The following property will limit the number of processor cores that Ghidra
 # will use for thread pools. If not specified, it will use the default number 
 # of processors returned from Runtime.getRuntime().getAvailableProcessors().