Make ServerController a bit more robust.
Merge pull request #109 from alesj/sc_rob

Make ServerController a bit more robust.