Pull out upstream response checks into helper function :lipstick: