Fix NPE in TestClientRMService