Revert "work toward better error reporting"