cleanup, comment
TODO: yaml exceptions handling.
moved yaml exceptions handling.