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

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