diff --git a/checkin_notes b/checkin_notes
index 7bf49f8fb2..30dcad0774 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6765,3 +6765,10 @@ Charlie 6 Jun 2011
         mac_saver_module.cpp
     clientgui/
         BOINCGUIApp.cpp
+
+Rom    22 Jun 2011
+    - WINSCR: if we see a WM_QUIT message in the message pump for whatever reason
+        terminate the screensaver process.
+        
+    clientscr/
+        screensaver_win.cpp
diff --git a/clientscr/screensaver_win.cpp b/clientscr/screensaver_win.cpp
index b50d4038bc..5896fe05d8 100644
--- a/clientscr/screensaver_win.cpp
+++ b/clientscr/screensaver_win.cpp
@@ -1412,6 +1412,15 @@ LRESULT CScreensaver::SaverProc(
             if (wParam == PBT_APMQUERYSUSPEND && gspfnMyVerifyPwdProc == NULL)
                 InterruptSaver();
             break;
+
+        case WM_QUIT:
+            BOINCTRACE(_T("CScreensaver::SaverProc Received WM_QUIT\n"));
+#ifdef _DEBUG
+            DebugBreak();
+#else
+            TerminateProcess(GetCurrentProcess(), 0);
+#endif
+            break;
     }
 
     if (WM_SETTIMER == uMsg) {