catch exception
add logging
Merge branch 'master' into js-dsc815
Merge pull request #747 from nla/js-dsc815

Js dsc815