updateDataStore now returns null, when update failed