Picture This - improved try/catch block
Merge branch 'master' of ../stage