diff --git a/lib/accel/accel_rpc.c b/lib/accel/accel_rpc.c
index 909162f73..baa467700 100644
--- a/lib/accel/accel_rpc.c
+++ b/lib/accel/accel_rpc.c
@@ -34,12 +34,13 @@ rpc_accel_get_opc_assignments(struct spdk_jsonrpc_request *request,
 		rc = _accel_get_opc_name(opcode, &name);
 		if (rc == 0) {
 			rc = spdk_accel_get_opc_module_name(opcode, &module_name);
-			if (rc != 0) {
+			if (rc == 0) {
+				spdk_json_write_named_string(w, name, module_name);
+			} else {
 				/* This isn't fatal but throw an informational message if we
 				 * cant get an module name right now */
 				SPDK_NOTICELOG("FYI error (%d) getting module name.\n", rc);
 			}
-			spdk_json_write_named_string(w, name, module_name);
 		} else {
 			/* this should never happen */
 			SPDK_ERRLOG("Invalid opcode (%d)).\n", opcode);
@@ -50,8 +51,7 @@ rpc_accel_get_opc_assignments(struct spdk_jsonrpc_request *request,
 
 	spdk_jsonrpc_end_result(request, w);
 }
-SPDK_RPC_REGISTER("accel_get_opc_assignments", rpc_accel_get_opc_assignments,
-		  SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("accel_get_opc_assignments", rpc_accel_get_opc_assignments, SPDK_RPC_RUNTIME)
 
 static void
 rpc_dump_module_info(struct module_info *info)
@@ -101,8 +101,7 @@ rpc_accel_get_module_info(struct spdk_jsonrpc_request *request,
 	spdk_json_write_array_end(info.w);
 	spdk_jsonrpc_end_result(request, info.w);
 }
-SPDK_RPC_REGISTER("accel_get_module_info", rpc_accel_get_module_info,
-		  SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("accel_get_module_info", rpc_accel_get_module_info, SPDK_RPC_RUNTIME)
 SPDK_RPC_REGISTER_ALIAS_DEPRECATED(accel_get_module_info, accel_get_engine_info)
 
 struct rpc_accel_assign_opc {