Clean up error messages and passing.
Consolidate util codes.  Clean up codes.