Make it fatal when the server cannot start
Add a limit after which the connection is closed
Add TODO
Better comments