fix (handlers): Proper testing for handler applicability.

fix (handlers): Proper testing for handler applicability. #1980