Cleaned up some error reporting.