Catching exceptions
Merge branch 'master' of github.com:saltzm/yadi