fix passing path issue
fix for catching Error on parsing
only log on error, dont fail
merge master
merge master in TQS