[[ Bug 13650 ]] Prevent a crash. This was introduced after the fix to bug 13569
Merge pull request #1278 from runrevpanos/bugfix-13650

[[ Bug 13650 ]] Prevent a crash. This was introduced after the fix to bu...