Few comments added
ExceptionListener improvements