Minor improvements on error messages.
Updates for release 0.6.0-beta