Error typos & more detailed message

Change-Id: I14096f2bbbbc6b2830f8c36a8160c0d797a4eb20
Merge "Error typos & more detailed message"