Don't allow clients without handlers.
Merge branch 'master' into protocolTest