Fix bug where clients askink for ConnectionManager never got a valid answer
bits and pieces, nothing important