Merge "Nullcheck ServiceConnector argument"