Pulled out empty DB checks