fix error messages
Merge branch 'version-0.03'