error handling
Merge pull request #21 from succi0303/error_handling

error handling