Add exception handling to return HTTP 200