1873 - Made Starting/Stopping connections multiple times less error prone

For #1873