Merge "Use message() instead of error_message()."