Quick fix for empty db bug.
Merge pull request #1 from ClaudioBryla/master

Quick fix for empty db bug.