Adding more details to error messaging. Fixes #10