Merge "Fixes crash when provider has null authorities"