More idiot-proofing.