Fixed NPE when a connector is no longer available (#11015)

Change-Id: Ie057beb80474546e08bb27a540773ae9f89b55a2
Merge "Fixed NPE when a connector is no longer available (#11015)" into 7.0