added new data checking: #MSG-329 In Progress