am 450e63af: Merge "Unlinked providers STILL shouldn\'t cause crashes"

* commit '450e63af4e5e434faef7c0c250ed10a00139eec9':
  Unlinked providers STILL shouldn't cause crashes