Check if timespan exists before using it (#1349)

Check if timespan exists before using it (#1349) #661