Temporarily fix crash on shutdown
Merge branch 'Rel20' of https://github.com/mangoszero/server into Rel20
Merge pull request #238 from Rochet2/Rel20

Temporarily fix crash on shutdown