check for emptiness in some more places