Excessive reconnects issue resolution

Fixes #868
In relationship to the above, forget what I said if this happens only once (maybe because msg type is None?)