Fix error message, and pulled in req fields. cgmcandrews, yyan, cjaday, pelynch