Added an early failure for non existing data