am 69dff541: Merge "avoid stopping app in case of accessing empty db"

* commit '69dff54168cd680ae7c4825c96b0f3cda4ccf0f8':
  avoid stopping app in case of accessing empty db