diff --git a/checkin_notes b/checkin_notes
index db28d76a27..3739668e6e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9020,3 +9020,9 @@ David  10 Nov 2009
 
     sched/
         sched_send.cpp
+
+Charlie 17 Sept 2009
+    - Mac installer: fix crash bug in AddRemoveUser utility.
+        
+    mac_installer/
+        AddRemoveUser.cpp
diff --git a/mac_installer/AddRemoveUser.cpp b/mac_installer/AddRemoveUser.cpp
index 68f201baf4..160f515eb2 100644
--- a/mac_installer/AddRemoveUser.cpp
+++ b/mac_installer/AddRemoveUser.cpp
@@ -192,6 +192,7 @@ void SetLoginItem(Boolean addLogInItem){
     for (Counter = NumberOfLoginItems ; Counter > 0 ; Counter--)
     {
         p = ReturnLoginItemPropertyAtIndex(kCurrentUser, kApplicationNameInfo, Counter-1);
+        if (p == NULL) continue;
         q = p;
         while (*q)
         {