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

* commit '8462d63c238117bd6f9dea3c073b5996564621b1':
  Add null pointer check in removeConnection

Change-Id: I820fe9de2186784261b7c8dd838fa1ebcf1bab6a