BCCVL-224: Fix move xmlrpc service to not return None