diff --git a/checkin_notes b/checkin_notes
index ced6e2e538..18e9f1cbab 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6156,3 +6156,9 @@ Charlie 29 July 2008
 
 Charlie 30 July 2008
     - MGR: async GUI RPCs: Bug fixes.
+    clientgui/
+        AsyncRPC.cpp
+        MainDocument.cpp,.h
+        sg_BoincSimpleGUI.cpp
+        BOINCBaseFrame.cpp
+        BOINCGUIApp.h
diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index 401ac4ff03..b416158995 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -303,11 +303,13 @@ void CBOINCBaseFrame::OnClose(wxCloseEvent& event) {
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
     if (!event.CanVeto()) {
+        wxGetApp().FrameClosed();
         Destroy();
     } else {
         Hide();
     }
 #else
+    wxGetApp().FrameClosed();
     Destroy();
 #endif
 
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index dfcf25590e..ffc354848a 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -115,6 +115,7 @@ public:
     wxLocale*           GetLocale()                 { return m_pLocale; }
     CSkinManager*       GetSkinManager()            { return m_pSkinManager; }
     CBOINCBaseFrame*    GetFrame()                  { return m_pFrame; }
+    void                FrameClosed()               { m_pFrame = NULL; }
     CMainDocument*      GetDocument()               { return m_pDocument; }
     wxString            GetArguments()              { return m_strBOINCArguments; }
     wxString            GetRootDirectory()          { return m_strBOINCMGRRootDirectory; }