Small cleanup, trying to be consistent in checking everything possible before the synchronize block