fixes error reporting issues #7 and #8