diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java b/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
index a24a4a28..53c2d93b 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
@@ -208,6 +208,10 @@ public class NvHTTP {
 		String serverInfo = getServerInfo();
 		
 		details.name = getXmlString(serverInfo, "hostname");
+		if (details.name == null || details.name.isEmpty()) {
+			details.name = "UNKNOWN";
+		}
+
 		details.uuid = UUID.fromString(getXmlString(serverInfo, "uniqueid"));
 		details.macAddress = getXmlString(serverInfo, "mac");