am 1efb4c21: am 3edc78c7: Guard against directory provider crash

* commit '1efb4c217ac50a3ed7b1246dac8f9b0a041b2593':
  Guard against directory provider crash