Merge "Fix error messages handling." am: ad707b0222
am: 469a77ba5a

Change-Id: Iae6aa4495746a124f84e3d272ceb70ff98d47b2f