Add NSNull check when updating from remote
Use performBlockAndWait