acu116757 - Refactoring code and always checking if namespace is blank