Merge "Clean up error reporting." into qt-dev