Empty DB fix