diff --git a/checkin_notes b/checkin_notes
index 34e8cb4507..fa5743e5ba 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3678,3 +3678,12 @@ Rom    9 Apr 2006
     lib/
         diagnostics.C, .h
         stackwalker_win.cpp, .h
+
+Rom    10 Apr 2006
+    - Bug Fix: Fix a crash condition where a result maybe in the list view but
+        may have already been cycled out of the system.  There is a brief
+        period of time where the result is being sent back to the scheduler and
+        the user may switch back to the work tab where this crash would occur.
+        
+    clientgui/
+        ViewWork.cpp
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index 2609eedae0..8aeea46acd 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -28,7 +28,7 @@
 #include "BOINCListCtrl.h"
 #include "ViewWork.h"
 #include "Events.h"
-#include "../lib/error_numbers.h"
+#include "error_numbers.h"
 
 #include "res/result.xpm"
 
@@ -548,12 +548,14 @@ void CViewWork::UpdateSelection() {
                 );
 */
             }
+
+            project = pDoc->state.lookup_project(result->project_url);
+            CBOINCBaseView::UpdateWebsiteSelection(GRP_WEBSITES, project);
+        } else {
+            CBOINCBaseView::UpdateWebsiteSelection(GRP_WEBSITES, NULL);
         }
+
         m_pTaskPane->EnableTask(pGroup->m_Tasks[BTN_ABORT]);
-
-        project = pDoc->state.lookup_project(result->project_url);
-        CBOINCBaseView::UpdateWebsiteSelection(GRP_WEBSITES, project);
-
     } else {
         m_pTaskPane->DisableTaskGroupTasks(pGroup);
     }