Fix for unique disconnect messages failing

after a map change.