Resolved an issue where a db response could break the returned response object