Added exception handling around YAML loading.
Resolved conflict.