Improve error messages. Do not rewrite the error if we're not 100% of the root douse of the problem.