fix for case if namespace is not used

We don't use namespace in our environment.
Here is a fix to make namespace optional.