Handle YAML parser error as well

Fixes bug: #1185590
Change-Id: Id561e2769d1f0192dd831450f10e05e8213bffa8
Merge "Handle YAML parser error as well"