Add exceptions/listener