Additional modifications to error reporting
Merge pull request #66 from Ricky1833/master

Additional modifications to error reporting