ZEN-15670

Contains unit tests fix
Are XML parsing errors really something that you should ignore?