remove a somehow duplicate test
make it null proof