Merge pull request #26 from ZeroCater/batch-error-support

Batch error support