More exception-proofing.