Removed redundant logic left behind from previous refactoring
Do not listen to error event on socket - Add to domain instead to catch errors