Merge "Fix error messages handling."
am: ad707b0222

Change-Id: If342206c1dcc028f696a3aadd99a1df66282cc18