Added protection if the fill number is not available