Exception fixes
Merge pull request #2 from david-maza/dhfixes

Exception fixes