Refactor.
Allow for testing for no handler of any type