Merge "Improve error reporting for issue #3183612" into gingerbread