Make ServerController a bit more robust.