Cleaned up logging and error messages.