Server crash fix.
Merge pull request #2943 from Aranclanos/ServerCrash

Server crash fix.