diff --git a/client/system/info_windows.go b/client/system/info_windows.go
index 69b4ad008..76b13bbc3 100644
--- a/client/system/info_windows.go
+++ b/client/system/info_windows.go
@@ -36,7 +36,8 @@ func getOSNameAndVersion() (string, string) {
 	query := wmi.CreateQuery(&dst, "")
 	err := wmi.Query(query, &dst)
 	if err != nil {
-		log.Fatal(err)
+		log.Error(err)
+		return "Windows", getBuildVersion()
 	}
 
 	if len(dst) == 0 {