Merge "Add more detail to the error reporting."