Set the "error" field in the right array

Change-Id: Id822ceb53c57daac0000bef3b304bb0260efe4ce
Merge "Set the "error" field in the right array"