Merge "Don't fail if default namespace isn't found"