Another brain fart. Reverting changes done to channel error handling.