Cleaned up some error reporting; standardize some.