The event handler was being created too soon

This should cause a complete deadlock in the master and I am
stumped why it has not!