am 33231f58: Fixing crash in empty folders. (Bug 11627191)

* commit '33231f587e1a6f716af68e6198df774d2847a8e5':
  Fixing crash in empty folders. (Bug 11627191)