Fixed exception handling per issue #28
Merge pull request #30 from box/exception

Fixed exception handling per issue #28