Minor cleanup to http server methods.
More exception handling.