Closes #398, Allow and handle nil namespace_identifier.

* Closes #398, Allow and handle nil namespace_identifier
* Rework of #400.