Re-fix exception in listener