Add ListenerException
Enhance comments