Merge "Fix error printing code."
am: b0c5cd27a1

Change-Id: I2b81c0eaf3724807731644f0bef17c9d84766988