Refs #7030. Fixing reported crash.
Merge remote-tracking branch 'origin/bugfix/7030_vsi_crash'