beefing up checking for weird things