slightly improved error reporting - Issue #7