diff --git a/api/boinc_api.C b/api/boinc_api.C
index 08d5ae7948..69bf4d1ec2 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -66,7 +66,7 @@ using namespace std;
 // (not counting the part after the last checkpoint in an episode).
 
 static APP_INIT_DATA		aid;
-APP_CLIENT_SHM	            *app_client_shm;
+APP_CLIENT_SHM	            *app_client_shm=0;
 static	double				timer_period = 1.0;    // period of API timer
     // This determines the resolution of fraction done and CPU time reporting
     // to the core client, and of checkpoint enabling.
@@ -119,11 +119,13 @@ int boinc_init(bool standalone_ /* = false */) {
     standalone = standalone_;
 
     retval = boinc_parse_init_data_file();
-    if (retval) return retval;
-
-    retval = setup_shared_mem();
     if (retval) {
         standalone = true;
+    } else {
+        retval = setup_shared_mem();
+        if (retval) {
+            standalone = true;
+        }
     }
 
     // copy the WU CPU time to a separate var,
diff --git a/checkin_notes b/checkin_notes
index 16cd59a60d..7fe0839fae 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12977,3 +12977,10 @@ David  June 2 2004
 		gui_titles.C
 		win/
 			boinc_gui.rc
+
+David  June 2 2004
+	- API: if app init data file not present,
+		set standalone to true, don't return error
+
+	api/
+		boinc_api.C