Merge pull request #211 from VWoeltjen/mct198

[Persistence] Avoid polling uninitialized database