Merge pull request #163 from fsb4000/error