Fixes namespacing issue
Merge pull request #269 from titusfortner/exception

Fixes namespacing issue
Merge remote-tracking branch 'upstream/master'