Check if NAMESPACE is ok

[hadley]

And if it's not, revert to the previous version (or just leave empty)