teiiddes-1647: Corrected default ns logic
Merge pull request #156 from tejones/teiiddes-1647

TEIIDDES-1647