EES-13396 better exception handling and tests
Merge pull request #1 from moxiespaces/errors

EES-13396 better exception handling and tests