Added null checks to fixture dropDatabase