fixes error message
Merge bugfixes from branch '0.2.x'