Merge pull request #2 from gbromios/master

Changed Error handling