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

EES-13396 better exception handling and tests