Added better error handling when namespace are missing
Merge branch 'core-pr-3' into development