Catch more errors
Merge branch 'master' of https://github.com/watoki/curir