Use restify, improve error handling