More checks that should have been there in the first place, cleanup.