More careful sanity checking