Interim patch for DNN-4078.  This does not fix the issue but provides a better error message.