[[ Bugfix 13385 ]] Fix a null-pointer crash on Linux server
Merge pull request #1139 from runrevfraser/bugfix-13385

[[ Bugfix 13385 ]] Fix a null-pointer crash on Linux server