Improved error message
Fixes #97
Fixes #192