Tighten up checking.