teiiddes-2153: Added null check and added logic for multiple namespaces in the case of Message mode.
teiiddes-2153a: Added null check and ns for multiple namespaces in message mode
Merge pull request #342 from tejones/teiiddes-2153

teiiddes-2153