fix #8056 - more refinements to checking data