Changed the way errors are passed to the httpserver
merge