Prevent crash during startup because there are no documents in the collection
Merge branch 'release/2014-12-03' into develop