Check if DataFields exist before foreach'ing them
Merge pull request #41 from trev/3.0-DataFieldsPatch

Check if DataFields exist before foreach'ing them