added rescue condition
Merge branch 'master' of github.com:railsfactory-saravanakumar/mosaic_dev