A minor mistake corrected. There was no broker-id in the arguments to
the handler function, but information regarding that channel.
Refactored code in the client.