Moved response body checking logic out of models