Trying to take out offending handler