wrapped around try catch
Merge branch 'master' into georgiana

y