Move checking/logging out of executeModification()