Now handles no image