Refactor channel handler
Refactor exception