Make batch errors align with normal errors.

Fixes issue #169.

Reviewed in http://codereview.appspot.com/6444046/.
3 files changed