Add error handling
Merge pull request #6 from danimal141/feature/error-handling

Add error handling