Guard against NPE in ServiceConnector

Fixes: 157759109
Test: presubmit
Change-Id: Ic1f594e667af50c0df8e566be4efdbaab6dccb26
1 file changed