Some more fool-proofing checks