Issue #63, nil client message, rapid AMQ restarts

At present this does not implement suggested
changes to the heartbeating logic.