Improved base handler checks