Merge "Fix error messages handling."