Better handling of no image