diff --git a/src/analyze.cpp b/src/analyze.cpp
index d142b8632..5dd7b0d18 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -4433,7 +4433,8 @@ void find_libc_lib_path(CodeGen *g) {
             if (g->msvc_lib_dir == nullptr) {
                 Buf* vc_lib_dir = buf_alloc();
                 if (os_get_win32_vcruntime_path(vc_lib_dir, g->zig_target.arch.arch)) {
-                    zig_panic("Unable to determine vcruntime path.");
+                    fprintf(stderr, "Unable to determine vcruntime path. --msvc-lib-dir");
+                    exit(1);
                 }
                 g->msvc_lib_dir = vc_lib_dir;
             }
@@ -4441,7 +4442,8 @@ void find_libc_lib_path(CodeGen *g) {
             if (g->libc_lib_dir == nullptr) {
                 Buf* ucrt_lib_path = buf_alloc();
                 if (os_get_win32_ucrt_lib_path(sdk, ucrt_lib_path, g->zig_target.arch.arch)) {
-                    zig_panic("Unable to determine ucrt path.");
+                    fprintf(stderr, "Unable to determine ucrt path. --libc-lib-dir");
+                    exit(1);
                 }
                 g->libc_lib_dir = ucrt_lib_path;
             }
@@ -4449,7 +4451,8 @@ void find_libc_lib_path(CodeGen *g) {
             if (g->kernel32_lib_dir == nullptr) {
                 Buf* kern_lib_path = buf_alloc();
                 if (os_get_win32_kern32_path(sdk, kern_lib_path, g->zig_target.arch.arch)) {
-                    zig_panic("Unable to determine kernel32 path.");
+                    fprintf(stderr, "Unable to determine kernel32 path. --kernel32-lib-dir");
+                    exit(1);
                 }
                 g->kernel32_lib_dir = kern_lib_path;
             }
diff --git a/src/os.cpp b/src/os.cpp
index 97462bd65..d335d8d21 100644
--- a/src/os.cpp
+++ b/src/os.cpp
@@ -1334,6 +1334,9 @@ com_done:;
 
 int os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_ArchType platform_type) {
 #if defined(ZIG_OS_WINDOWS)
+    if (buf_len(sdk->path10) == 0 || buf_len(sdk->version10) == 0) {
+        return ErrorFileNotFound;
+    }
     buf_resize(output_buf, 0);
     buf_appendf(output_buf, "%s\\Lib\\%s\\ucrt\\", buf_ptr(&sdk->path10), buf_ptr(&sdk->version10));
     switch (platform_type) {