Message router again properly forwards terminate messages to the server.

At the same time I have reduced the complexity of the forwarding logic.

Resolves Issue #213