am 3edc78c7: Guard against directory provider crash

* commit '3edc78c78ba277b116c28fde9b8759cb18f03e1e':
  Guard against directory provider crash