Finished changes to making disarming fail.