#201 little improvements to the error message and exception handling