Fix for checking when data fields are missing