adding try/catch block
Merge remote-tracking branch 'origin/master'
adding try/catch block