move to standardized error handling
Merge pull request #473 from anodelman/fix-empty-tests

move to standardized error handling