Add last-minute button, fix exception