diff --git a/checkin_notes b/checkin_notes
index 780660f797..97ebd44523 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6040,3 +6040,9 @@ Rom    13 Aug 2010
     /
         configure.ac
         version.h
+
+Rom    13 Aug 2010
+    - lib: prevent crash on startup if slot directories have been deleted.
+    
+    lib/
+        filesys.cpp
diff --git a/lib/filesys.cpp b/lib/filesys.cpp
index efc71c5d84..f05733204b 100644
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
@@ -192,11 +192,15 @@ void dir_close(DIRREF dirp) {
 
 bool is_dir_empty(const char *p) {
     char file[256];
+
     DIRREF dir = dir_open(p);
+    if (!dir) return true;
+
     if (dir_scan(file, dir, sizeof(file))) {
         dir_close(dir);
         return false;
     }
+
     return true;
 }
 
diff --git a/win_build/boinc.sln b/win_build/boinc.sln
index 0d7cb04b82..63928c68f9 100644
--- a/win_build/boinc.sln
+++ b/win_build/boinc.sln
@@ -313,9 +313,7 @@ Global
 		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|x64.ActiveCfg = Release|x64
 		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|x64.Build.0 = Release|x64
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|Win32.Build.0 = Debug|Win32
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|x64.ActiveCfg = Debug|x64
-		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|x64.Build.0 = Debug|x64
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.EmuDebug|Win32.ActiveCfg = Debug|Win32
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.EmuDebug|Win32.Build.0 = Debug|Win32
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.EmuDebug|x64.ActiveCfg = Debug|x64
@@ -325,9 +323,7 @@ Global
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.EmuRelease|x64.ActiveCfg = Release|x64
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.EmuRelease|x64.Build.0 = Release|x64
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|Win32.ActiveCfg = Release|Win32
-		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|Win32.Build.0 = Release|Win32
 		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|x64.ActiveCfg = Release|x64
-		{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|x64.Build.0 = Release|x64
 		{4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|Win32.Build.0 = Debug|Win32
 		{4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index e793743216..bb8a947d6c 100644
Binary files a/win_build/installerv2/BOINC.ism and b/win_build/installerv2/BOINC.ism differ
diff --git a/win_build/installerv2/BOINCx64.ism b/win_build/installerv2/BOINCx64.ism
index d636c5f5df..3090d5467b 100644
Binary files a/win_build/installerv2/BOINCx64.ism and b/win_build/installerv2/BOINCx64.ism differ