Fix check for optional handlers. Only abort when the network has not finished.
Work on message handling on server side.