Updated to handle missing runs properly