Don't crash while waiting for clients
Merge pull request #5 from roshambo/patch-1

Don't crash while waiting for clients