Error handling and specs

Old changes that handled some additional errors that were observed, with this the service will retry and remove the socket instead of failing.
Some additional specs