Handle errors.
Merge pull request #1 from iclanzan/patch-1

Handle errors.