Improved hanling of "empty" objects