Fixes #16796 - ensuring forData object