Namespace more defensively