Change handling errors
Merge pull request #47 from baby-loris/errors

Change handling errors #44