Some minor changes to the new ExceptionListener mechanism