A bit more checking