Imrpove error handling and make restify by default