moving None checks after update_dictionary