Merge in exception throwing and http status codes