Do a little more checking.