Avoids segfault is extra connection can't be established Closes #1903 Change-Id: I6eb7315f6774015703c7ad036e08596f7f550d60 (cherry picked from commit 172f389395) (cherry picked from commit 4ed9638e02)
172f389395
4ed9638e02