Merge "Improved error message during export." into tools_r8