Fix database initialization if database already exists

Gradl, Tobiasrequested to merge
v1-dev into v1-master

Merge request reports