INTEG-343 catch the case missing resource exception
Merge branch 'master' into feature/stabilization