Fixing issues if data set does not contain required fields