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

Fixes namespacing issue
Fixes issue with stale elements