diff --git a/src/main/java/com/sheepit/client/os/Windows.java b/src/main/java/com/sheepit/client/os/Windows.java
index 71ab8ce..09e1e16 100644
--- a/src/main/java/com/sheepit/client/os/Windows.java
+++ b/src/main/java/com/sheepit/client/os/Windows.java
@@ -91,9 +91,15 @@ public class Windows extends OS {
 		}
 		catch (NullPointerException e) {
 			System.err.println("Windows::isSupported Failed to extract Windows build number: " + e);
-			String ver = operatingSystem.getVersionInfo().getVersion();
-			List<String> supportedVersions = List.of("8.1", "10", "11", "Server 2016", "Server 2012 R2", "Server 2019", "Server 2022");
-			return super.isSupported() && supportedVersions.contains(ver);
+			var versionInfo = operatingSystem.getVersionInfo();
+			if (versionInfo == null) {
+				return false;
+			}
+			else {
+				String ver = versionInfo.getVersion();
+				List<String> supportedVersions = List.of("8.1", "10", "11", "Server 2016", "Server 2012 R2", "Server 2019", "Server 2022");
+				return super.isSupported() && supportedVersions.contains(ver);
+			}
 		}
 		return
 			super.isSupported() &&