added extra check for the data returned from the DataMappers