Correctly handle ErrorResponse after one or more DataRows

This problem came up while running some tests yesterday and today.