Revert "cleaned up error messages" because accidentally included other
commit

This reverts commit d942af9638386f507fa5bb7046b4b8b6afb74384.
fix it up