diff --git a/checkin_notes b/checkin_notes
index 2232791793..96f3923020 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4460,3 +4460,10 @@ David  21 June 2010
             wrapper.cpp
         multi_thread/
             multi_thread.cpp
+
+David  22 June 2010
+	- client: fix crashing bug when account manager returns
+		new project w/ "no more work" flag set
+
+	client/
+		acct_mgr.cpp
diff --git a/client/acct_mgr.cpp b/client/acct_mgr.cpp
index 86de785726..ca5b94482d 100644
--- a/client/acct_mgr.cpp
+++ b/client/acct_mgr.cpp
@@ -490,7 +490,15 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) {
                         acct.url.c_str(), acct.authenticator.c_str(), "", true
                     );
                     if (acct.dont_request_more_work.present) {
-                        pp->dont_request_more_work = acct.dont_request_more_work.value;
+                        pp = gstate.lookup_project(acct.url.c_str());
+                        if (pp) {
+                            pp->dont_request_more_work = acct.dont_request_more_work.value;
+                        } else {
+                            msg_printf(NULL, MSG_INTERNAL_ERROR,
+                                "Project not found: %s",
+                                acct.url.c_str()
+                            );
+                        }
                     }
                 }
             }