Some fixes. Still not RuntimeException and TooManyListenersException