Added channel exceptions and handling of listeners