Merge pull request #2 from donmahallem/master

Added Error Handling