Fix handler for non existing images