Merge "Don't fail catastrophically on non-existing namespace"