diff --git a/checkin_notes b/checkin_notes
index 78af83111b..6e41269469 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1619,3 +1619,10 @@ David  Feb 25 2008
 
     clientgui/
         MainDocument.cpp
+
+Rom    Feb 25 2008
+    - MGR: Fix the crash on linux when BOINC Manager is shut down.
+        (Patch from Michael Roberts)
+        
+    clientgui/
+        AdvancedFrame.cpp
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index e1684b3b68..f8853a7060 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -283,16 +283,19 @@ CAdvancedFrame::~CAdvancedFrame() {
     if (m_pRefreshStateTimer) {
         m_pRefreshStateTimer->Stop();
         delete m_pRefreshStateTimer;
+        m_pRefreshStateTimer = NULL;
     }
 
     if (m_pFrameRenderTimer) {
         m_pFrameRenderTimer->Stop();
         delete m_pFrameRenderTimer;
+        m_pFrameRenderTimer = NULL;
     }
 
     if (m_pFrameListPanelRenderTimer) {
         m_pFrameListPanelRenderTimer->Stop();
         delete m_pFrameListPanelRenderTimer;
+        m_pFrameListPanelRenderTimer = NULL;
     }
 
     if (m_pStatusbar)
@@ -2120,7 +2123,7 @@ void CAdvancedFrame::UpdateRefreshTimerInterval( wxInt32 iCurrentNotebookPage )
         pView = wxDynamicCast(pwndNotebookPage, CBOINCBaseView);
         wxASSERT(pView);
 
-        if (m_pFrameListPanelRenderTimer->IsRunning()) {
+        if (m_pFrameListPanelRenderTimer && m_pFrameListPanelRenderTimer->IsRunning()) {
             m_pFrameListPanelRenderTimer->Stop();
 
             // View specific refresh rates only apply when a connection to the core