Improve error reporting.
0.0.9