Improving what happens with an empty database, fixes #14