Merge "avoid stopping app in case of accessing empty db"