Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c
am: dd0e3efd4d

* commit 'dd0e3efd4d70f36e0649abe6087a06a1fb0366b0':
  Add null pointer check in removeConnection

Change-Id: Icb2fb87eeeab4de28a1e117a8f74867f7c0002ac