lib/osm/member.rb in osm-1.2.18.dev.6 vs lib/osm/member.rb in osm-1.2.18.dev.7

@@ -388,14 +388,14 @@
         })
         updated = updated && data.is_a?(Hash) && data['data'].is_a?(Hash) && data['data']['value'].eql?(new_value)
       end # each attr to update
 
       # Do contacts
-      updated = contact.update(api, self, force) && updated
-      updated = primary_contact.update(api, self, force) && updated
-      updated = secondary_contact.update(api, self, force) && updated
-      updated = emergency_contact.update(api, self, force) && updated
-      updated = doctor.update(api, self, force) && updated
+      updated = (contact.nil? || contact.update(api, self, force)) && updated
+      updated = (primary_contact.nil? || primary_contact.update(api, self, force)) && updated
+      updated = (secondary_contact.nil? || secondary_contact.update(api, self, force)) && updated
+      updated = (emergency_contact.nil? ||emergency_contact.update(api, self, force)) && updated
+      updated = (doctor.nil? || doctor.update(api, self, force)) && updated
 
       # Finish off
       if updated
         reset_changed_attributes
         custom.clean_up!