Minor code enhancement in ConnectionManager