
        simplify namespace error cases

f1d60a7