diff --git a/lib/bdev/aio/bdev_aio_rpc.c b/lib/bdev/aio/bdev_aio_rpc.c
index 2f5c43ce0..670cabf64 100644
--- a/lib/bdev/aio/bdev_aio_rpc.c
+++ b/lib/bdev/aio/bdev_aio_rpc.c
@@ -81,10 +81,6 @@ spdk_rpc_construct_aio_bdev(struct spdk_jsonrpc_request *request,
 
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto cleanup;
-	}
-
 	spdk_json_write_string(w, req.name);
 	spdk_jsonrpc_end_result(request, w);
 
@@ -111,12 +107,7 @@ static void
 _spdk_rpc_delete_aio_bdev_cb(void *cb_arg, int bdeverrno)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
-	struct spdk_json_write_ctx *w;
-
-	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
+	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
diff --git a/lib/bdev/crypto/vbdev_crypto_rpc.c b/lib/bdev/crypto/vbdev_crypto_rpc.c
index 1f09f0e7b..3658e0751 100644
--- a/lib/bdev/crypto/vbdev_crypto_rpc.c
+++ b/lib/bdev/crypto/vbdev_crypto_rpc.c
@@ -87,11 +87,6 @@ spdk_rpc_construct_crypto_bdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		free_rpc_construct_crypto(&req);
-		return;
-	}
-
 	spdk_json_write_string(w, req.name);
 	spdk_jsonrpc_end_result(request, w);
 	free_rpc_construct_crypto(&req);
@@ -120,12 +115,7 @@ static void
 _spdk_rpc_delete_crypto_bdev_cb(void *cb_arg, int bdeverrno)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
-	struct spdk_json_write_ctx *w;
-
-	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
+	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
diff --git a/lib/bdev/error/vbdev_error_rpc.c b/lib/bdev/error/vbdev_error_rpc.c
index b3694cffd..c5580940f 100644
--- a/lib/bdev/error/vbdev_error_rpc.c
+++ b/lib/bdev/error/vbdev_error_rpc.c
@@ -110,10 +110,6 @@ spdk_rpc_construct_error_bdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto cleanup;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 
@@ -143,10 +139,6 @@ _spdk_rpc_delete_error_bdev_cb(void *cb_arg, int bdeverrno)
 	struct spdk_json_write_ctx *w;
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -241,10 +233,6 @@ spdk_rpc_bdev_inject_error(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto cleanup;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 
diff --git a/lib/bdev/iscsi/bdev_iscsi_rpc.c b/lib/bdev/iscsi/bdev_iscsi_rpc.c
index c07ffedb0..5a4f07b26 100644
--- a/lib/bdev/iscsi/bdev_iscsi_rpc.c
+++ b/lib/bdev/iscsi/bdev_iscsi_rpc.c
@@ -72,10 +72,6 @@ construct_iscsi_bdev_cb(void *cb_arg, struct spdk_bdev *bdev, int status)
 						 spdk_strerror(-status));
 	} else {
 		w = spdk_jsonrpc_begin_result(request);
-		if (w == NULL) {
-			return;
-		}
-
 		spdk_json_write_string(w, spdk_bdev_get_name(bdev));
 		spdk_jsonrpc_end_result(request, w);
 	}
@@ -125,12 +121,7 @@ static void
 _spdk_rpc_delete_iscsi_bdev_cb(void *cb_arg, int bdeverrno)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
-	struct spdk_json_write_ctx *w;
-
-	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
+	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
diff --git a/lib/bdev/lvol/vbdev_lvol_rpc.c b/lib/bdev/lvol/vbdev_lvol_rpc.c
index 22ac8b284..deff9030d 100644
--- a/lib/bdev/lvol/vbdev_lvol_rpc.c
+++ b/lib/bdev/lvol/vbdev_lvol_rpc.c
@@ -106,10 +106,6 @@ _spdk_rpc_lvol_store_construct_cb(void *cb_arg, struct spdk_lvol_store *lvol_sto
 	spdk_uuid_fmt_lower(lvol_store_uuid, sizeof(lvol_store_uuid), &lvol_store->uuid);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_string(w, lvol_store_uuid);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -202,10 +198,6 @@ _spdk_rpc_rename_lvol_store_cb(void *cb_arg, int lvserrno)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -273,10 +265,6 @@ _spdk_rpc_lvol_store_destroy_cb(void *cb_arg, int lvserrno)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -354,10 +342,6 @@ _spdk_rpc_construct_lvol_bdev_cb(void *cb_arg, struct spdk_lvol *lvol, int lvole
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_string(w, lvol->unique_id);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -449,10 +433,6 @@ _spdk_rpc_snapshot_lvol_bdev_cb(void *cb_arg, struct spdk_lvol *lvol, int lvoler
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_string(w, lvol->unique_id);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -531,10 +511,6 @@ _spdk_rpc_clone_lvol_bdev_cb(void *cb_arg, struct spdk_lvol *lvol, int lvolerrno
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_string(w, lvol->unique_id);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -613,10 +589,6 @@ _spdk_rpc_rename_lvol_bdev_cb(void *cb_arg, int lvolerrno)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -692,10 +664,6 @@ _spdk_rpc_inflate_lvol_bdev_cb(void *cb_arg, int lvolerrno)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -814,10 +782,6 @@ _spdk_rpc_resize_lvol_bdev_cb(void *cb_arg, int lvolerrno)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -892,10 +856,6 @@ _spdk_rpc_set_ro_lvol_bdev_cb(void *cb_arg, int lvolerrno)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -976,10 +936,6 @@ _spdk_rpc_destroy_lvol_bdev_cb(void *cb_arg, int lvolerrno)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -1110,11 +1066,6 @@ spdk_rpc_get_lvol_stores(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		free_rpc_get_lvol_stores(&req);
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	if (lvs_bdev != NULL) {
diff --git a/lib/bdev/malloc/bdev_malloc_rpc.c b/lib/bdev/malloc/bdev_malloc_rpc.c
index c99b6ad49..9adc6aeba 100644
--- a/lib/bdev/malloc/bdev_malloc_rpc.c
+++ b/lib/bdev/malloc/bdev_malloc_rpc.c
@@ -103,10 +103,6 @@ spdk_rpc_construct_malloc_bdev(struct spdk_jsonrpc_request *request,
 	free_rpc_construct_malloc(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_string(w, spdk_bdev_get_name(bdev));
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -134,12 +130,7 @@ static void
 _spdk_rpc_delete_malloc_bdev_cb(void *cb_arg, int bdeverrno)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
-	struct spdk_json_write_ctx *w;
-
-	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
+	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
diff --git a/lib/bdev/null/bdev_null_rpc.c b/lib/bdev/null/bdev_null_rpc.c
index 81cefb310..65cc70bc7 100644
--- a/lib/bdev/null/bdev_null_rpc.c
+++ b/lib/bdev/null/bdev_null_rpc.c
@@ -108,11 +108,6 @@ spdk_rpc_construct_null_bdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		free_rpc_construct_null(&req);
-		return;
-	}
-
 	spdk_json_write_string(w, bdev->name);
 	spdk_jsonrpc_end_result(request, w);
 	free_rpc_construct_null(&req);
@@ -141,12 +136,7 @@ static void
 _spdk_rpc_delete_null_bdev_cb(void *cb_arg, int bdeverrno)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
-	struct spdk_json_write_ctx *w;
-
-	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
+	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
diff --git a/lib/bdev/nvme/bdev_ftl_rpc.c b/lib/bdev/nvme/bdev_ftl_rpc.c
index 462375cfd..6d33a1932 100644
--- a/lib/bdev/nvme/bdev_ftl_rpc.c
+++ b/lib/bdev/nvme/bdev_ftl_rpc.c
@@ -90,10 +90,6 @@ _spdk_rpc_construct_ftl_bdev_cb(const struct ftl_bdev_info *bdev_info, void *ctx
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (!w) {
-		return;
-	}
-
 	spdk_uuid_fmt_lower(bdev_uuid, sizeof(bdev_uuid), &bdev_info->uuid);
 	spdk_json_write_object_begin(w);
 	spdk_json_write_named_string(w, "name", bdev_info->name);
@@ -198,12 +194,7 @@ static void
 _spdk_rpc_delete_ftl_bdev_cb(void *cb_arg, int bdeverrno)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
-	struct spdk_json_write_ctx *w;
-
-	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
+	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
diff --git a/lib/bdev/nvme/bdev_nvme_rpc.c b/lib/bdev/nvme/bdev_nvme_rpc.c
index 398e03b49..b275f78cd 100644
--- a/lib/bdev/nvme/bdev_nvme_rpc.c
+++ b/lib/bdev/nvme/bdev_nvme_rpc.c
@@ -100,10 +100,8 @@ spdk_rpc_set_bdev_nvme_options(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w != NULL) {
-		spdk_json_write_bool(w, true);
-		spdk_jsonrpc_end_result(request, w);
-	}
+	spdk_json_write_bool(w, true);
+	spdk_jsonrpc_end_result(request, w);
 
 	return;
 invalid:
@@ -127,10 +125,8 @@ rpc_set_bdev_nvme_hotplug_done(void *ctx)
 	struct spdk_jsonrpc_request *request = ctx;
 	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
-	if (w != NULL) {
-		spdk_json_write_bool(w, true);
-		spdk_jsonrpc_end_result(request, w);
-	}
+	spdk_json_write_bool(w, true);
+	spdk_jsonrpc_end_result(request, w);
 }
 
 static void
@@ -383,10 +379,6 @@ spdk_rpc_get_nvme_controllers(struct spdk_jsonrpc_request *request,
 
 	free_rpc_get_nvme_controllers(&req);
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	if (ctrlr != NULL) {
@@ -447,10 +439,6 @@ spdk_rpc_delete_nvme_controller(struct spdk_jsonrpc_request *request,
 	free_rpc_delete_nvme(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -544,11 +532,7 @@ apply_firmware_complete_reset(struct spdk_bdev_io *bdev_io, bool success, void *
 		return;
 	}
 
-	if (!(w = spdk_jsonrpc_begin_result(firm_ctx->request))) {
-		apply_firmware_cleanup(firm_ctx);
-		return;
-	}
-
+	w = spdk_jsonrpc_begin_result(firm_ctx->request);
 	spdk_json_write_string(w, "firmware commit succeeded. Controller reset in progress.");
 	spdk_jsonrpc_end_result(firm_ctx->request, w);
 	apply_firmware_cleanup(firm_ctx);
diff --git a/lib/bdev/nvme/nvme_rpc.c b/lib/bdev/nvme/nvme_rpc.c
index 010434e77..f1064187a 100644
--- a/lib/bdev/nvme/nvme_rpc.c
+++ b/lib/bdev/nvme/nvme_rpc.c
@@ -135,10 +135,6 @@ spdk_rpc_send_nvme_cmd_complete(struct rpc_send_nvme_cmd_ctx *ctx, const struct
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto out;
-	}
-
 	spdk_json_write_object_begin(w);
 	spdk_json_write_named_string(w, "cpl", ctx->resp.cpl_text);
 
diff --git a/lib/bdev/ocf/vbdev_ocf_rpc.c b/lib/bdev/ocf/vbdev_ocf_rpc.c
index 0667d9e37..b45c4a800 100644
--- a/lib/bdev/ocf/vbdev_ocf_rpc.c
+++ b/lib/bdev/ocf/vbdev_ocf_rpc.c
@@ -74,10 +74,8 @@ construct_cb(int status, struct vbdev_ocf *vbdev, void *cb_arg)
 						     status);
 	} else {
 		w = spdk_jsonrpc_begin_result(request);
-		if (w) {
-			spdk_json_write_string(w, vbdev->name);
-			spdk_jsonrpc_end_result(request, w);
-		}
+		spdk_json_write_string(w, vbdev->name);
+		spdk_jsonrpc_end_result(request, w);
 	}
 }
 
@@ -132,10 +130,8 @@ delete_cb(void *cb_arg, int status)
 						     status);
 	} else {
 		w = spdk_jsonrpc_begin_result(request);
-		if (w) {
-			spdk_json_write_bool(w, true);
-			spdk_jsonrpc_end_result(request, w);
-		}
+		spdk_json_write_bool(w, true);
+		spdk_jsonrpc_end_result(request, w);
 	}
 }
 
@@ -225,10 +221,8 @@ spdk_rpc_get_ocf_stats(struct spdk_jsonrpc_request *request, const struct spdk_j
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w) {
-		vbdev_ocf_stats_write_json(w, &stats);
-		spdk_jsonrpc_end_result(request, w);
-	}
+	vbdev_ocf_stats_write_json(w, &stats);
+	spdk_jsonrpc_end_result(request, w);
 
 end:
 	free_rpc_get_ocf_stats(&req);
@@ -311,9 +305,6 @@ spdk_rpc_get_ocf_bdevs(struct spdk_jsonrpc_request *request, const struct spdk_j
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
 
 	cctx.name    = req.name;
 	cctx.w       = w;
diff --git a/lib/bdev/passthru/vbdev_passthru_rpc.c b/lib/bdev/passthru/vbdev_passthru_rpc.c
index d3b818ad0..a551b8c44 100644
--- a/lib/bdev/passthru/vbdev_passthru_rpc.c
+++ b/lib/bdev/passthru/vbdev_passthru_rpc.c
@@ -84,10 +84,6 @@ spdk_rpc_construct_passthru_bdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto cleanup;
-	}
-
 	spdk_json_write_string(w, req.name);
 	spdk_jsonrpc_end_result(request, w);
 
@@ -117,10 +113,6 @@ _spdk_rpc_delete_passthru_bdev_cb(void *cb_arg, int bdeverrno)
 	struct spdk_json_write_ctx *w;
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
 }
diff --git a/lib/bdev/pmem/bdev_pmem_rpc.c b/lib/bdev/pmem/bdev_pmem_rpc.c
index b3a1627e5..c1aeffc1e 100644
--- a/lib/bdev/pmem/bdev_pmem_rpc.c
+++ b/lib/bdev/pmem/bdev_pmem_rpc.c
@@ -81,16 +81,10 @@ spdk_rpc_construct_pmem_bdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		free_rpc_construct_pmem_bdev(&req);
-		return;
-	}
-
 	spdk_json_write_string(w, spdk_bdev_get_name(bdev));
 	spdk_jsonrpc_end_result(request, w);
 
 	free_rpc_construct_pmem_bdev(&req);
-
 	return;
 
 invalid:
@@ -117,12 +111,7 @@ static void
 _spdk_rpc_delete_pmem_bdev_cb(void *cb_arg, int bdeverrno)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
-	struct spdk_json_write_ctx *w;
-
-	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
+	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
@@ -214,11 +203,6 @@ spdk_rpc_create_pmem_pool(struct spdk_jsonrpc_request *request,
 	pmemblk_close(pbp);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		free_rpc_create_pmem_pool(&req);
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	free_rpc_create_pmem_pool(&req);
@@ -277,11 +261,6 @@ spdk_rpc_pmem_pool_info(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		free_rpc_pmem_pool_info(&req);
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	spdk_json_write_object_begin(w);
 	spdk_json_write_named_uint64(w, "num_blocks", num_blocks);
@@ -339,11 +318,6 @@ spdk_rpc_delete_pmem_pool(struct spdk_jsonrpc_request *request,
 	unlink(req.pmem_file);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		free_rpc_delete_pmem_pool(&req);
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	free_rpc_delete_pmem_pool(&req);
diff --git a/lib/bdev/raid/bdev_raid_rpc.c b/lib/bdev/raid/bdev_raid_rpc.c
index 8ecdc3655..dd3a446fd 100644
--- a/lib/bdev/raid/bdev_raid_rpc.c
+++ b/lib/bdev/raid/bdev_raid_rpc.c
@@ -112,10 +112,6 @@ spdk_rpc_get_raid_bdevs(struct spdk_jsonrpc_request *request, const struct spdk_
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto cleanup;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	/* Get raid bdev list based on the category requested */
@@ -288,10 +284,6 @@ spdk_rpc_construct_raid_bdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto cleanup;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 
@@ -365,10 +357,6 @@ destroy_raid_bdev_done(void *cb_arg, int rc)
 	raid_bdev_config_cleanup(raid_cfg);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto exit;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 exit:
diff --git a/lib/bdev/rbd/bdev_rbd_rpc.c b/lib/bdev/rbd/bdev_rbd_rpc.c
index 8ed4ff6b0..78ad90205 100644
--- a/lib/bdev/rbd/bdev_rbd_rpc.c
+++ b/lib/bdev/rbd/bdev_rbd_rpc.c
@@ -135,10 +135,6 @@ spdk_rpc_construct_rbd_bdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto cleanup;
-	}
-
 	spdk_json_write_string(w, spdk_bdev_get_name(bdev));
 	spdk_jsonrpc_end_result(request, w);
 
@@ -168,10 +164,6 @@ _spdk_rpc_delete_rbd_bdev_cb(void *cb_arg, int bdeverrno)
 	struct spdk_json_write_ctx *w;
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, bdeverrno == 0);
 	spdk_jsonrpc_end_result(request, w);
 }
diff --git a/lib/bdev/rpc/bdev_rpc.c b/lib/bdev/rpc/bdev_rpc.c
index aa8586fbb..3b37fc11d 100644
--- a/lib/bdev/rpc/bdev_rpc.c
+++ b/lib/bdev/rpc/bdev_rpc.c
@@ -164,11 +164,6 @@ spdk_rpc_get_bdevs_iostat(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		free(ctx);
-		return;
-	}
-
 	/*
 	 * Increment initial bdev_count so that it will never reach 0 in the middle
 	 * of iterating.
@@ -341,10 +336,6 @@ spdk_rpc_get_bdevs(struct spdk_jsonrpc_request *request,
 
 	free_rpc_get_bdevs(&req);
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	if (bdev != NULL) {
@@ -464,10 +455,6 @@ spdk_rpc_set_bdev_qos_limit_complete(void *cb_arg, int status)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -537,12 +524,7 @@ static void
 _spdk_bdev_histogram_status_cb(void *cb_arg, int status)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
-	struct spdk_json_write_ctx *w;
-
-	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
+	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_bool(w, status == 0);
 	spdk_jsonrpc_end_result(request, w);
@@ -628,10 +610,6 @@ _spdk_rpc_bdev_histogram_data_cb(void *cb_arg, int status, struct spdk_histogram
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto free_encoded_histogram;
-	}
-
 	spdk_json_write_object_begin(w);
 	spdk_json_write_named_string(w, "histogram", encoded_histogram);
 	spdk_json_write_named_int64(w, "bucket_shift", histogram->bucket_shift);
diff --git a/lib/bdev/split/vbdev_split_rpc.c b/lib/bdev/split/vbdev_split_rpc.c
index 773f7a2c9..d4d6600db 100644
--- a/lib/bdev/split/vbdev_split_rpc.c
+++ b/lib/bdev/split/vbdev_split_rpc.c
@@ -76,10 +76,6 @@ spdk_rpc_construct_split_vbdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto out;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	base_bdev = spdk_bdev_get_by_name(req.base_bdev);
@@ -139,10 +135,6 @@ spdk_rpc_destruct_split_vbdev(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		goto out;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 out:
diff --git a/lib/bdev/virtio/bdev_virtio_rpc.c b/lib/bdev/virtio/bdev_virtio_rpc.c
index 724c7ae54..de9daab44 100644
--- a/lib/bdev/virtio/bdev_virtio_rpc.c
+++ b/lib/bdev/virtio/bdev_virtio_rpc.c
@@ -64,10 +64,6 @@ spdk_rpc_remove_virtio_bdev_cb(void *ctx, int errnum)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -114,10 +110,6 @@ spdk_rpc_get_virtio_scsi_devs(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	bdev_virtio_scsi_dev_list(w);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -167,17 +159,15 @@ spdk_rpc_create_virtio_dev_cb(void *ctx, int result, struct spdk_bdev **bdevs, s
 	}
 
 	w = spdk_jsonrpc_begin_result(req->request);
-	if (w) {
-		spdk_json_write_array_begin(w);
+	spdk_json_write_array_begin(w);
 
-		for (i = 0; i < cnt; i++) {
-			spdk_json_write_string(w, spdk_bdev_get_name(bdevs[i]));
-		}
-
-		spdk_json_write_array_end(w);
-		spdk_jsonrpc_end_result(req->request, w);
+	for (i = 0; i < cnt; i++) {
+		spdk_json_write_string(w, spdk_bdev_get_name(bdevs[i]));
 	}
 
+	spdk_json_write_array_end(w);
+	spdk_jsonrpc_end_result(req->request, w);
+
 	free_rpc_construct_virtio_dev(ctx);
 }
 
diff --git a/lib/copy/ioat/copy_engine_ioat_rpc.c b/lib/copy/ioat/copy_engine_ioat_rpc.c
index 0cade48ee..f13aab18b 100644
--- a/lib/copy/ioat/copy_engine_ioat_rpc.c
+++ b/lib/copy/ioat/copy_engine_ioat_rpc.c
@@ -108,10 +108,6 @@ spdk_rpc_scan_ioat_copy_engine(struct spdk_jsonrpc_request *request,
 	copy_engine_ioat_enable_probe();
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
diff --git a/lib/event/app.c b/lib/event/app.c
index 1930cd2ed..36993cb5f 100644
--- a/lib/event/app.c
+++ b/lib/event/app.c
@@ -1071,10 +1071,6 @@ spdk_rpc_start_subsystem_init_cpl(void *arg1)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1106,10 +1102,8 @@ spdk_rpc_subsystem_init_poller_ctx(void *ctx)
 
 	if (spdk_rpc_get_state() == SPDK_RPC_RUNTIME) {
 		w = spdk_jsonrpc_begin_result(poller_ctx->request);
-		if (w != NULL) {
-			spdk_json_write_bool(w, true);
-			spdk_jsonrpc_end_result(poller_ctx->request, w);
-		}
+		spdk_json_write_bool(w, true);
+		spdk_jsonrpc_end_result(poller_ctx->request, w);
 		spdk_poller_unregister(&poller_ctx->init_poller);
 		free(poller_ctx);
 	}
@@ -1126,9 +1120,6 @@ spdk_rpc_wait_subsystem_init(struct spdk_jsonrpc_request *request,
 
 	if (spdk_rpc_get_state() == SPDK_RPC_RUNTIME) {
 		w = spdk_jsonrpc_begin_result(request);
-		if (w == NULL) {
-			return;
-		}
 		spdk_json_write_bool(w, true);
 		spdk_jsonrpc_end_result(request, w);
 	} else {
diff --git a/lib/event/rpc/app_rpc.c b/lib/event/rpc/app_rpc.c
index d98c13d3c..1ad954a51 100644
--- a/lib/event/rpc/app_rpc.c
+++ b/lib/event/rpc/app_rpc.c
@@ -100,9 +100,6 @@ spdk_rpc_kill_instance(struct spdk_jsonrpc_request *request,
 	kill(getpid(), signals[i].signal);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -142,10 +139,6 @@ spdk_rpc_context_switch_monitor(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_object_begin(w);
 
 	spdk_json_write_named_bool(w, "enabled", spdk_reactor_context_switch_monitor_enabled());
diff --git a/lib/event/rpc/subsystem_rpc.c b/lib/event/rpc/subsystem_rpc.c
index 92cbab171..04348ea9c 100644
--- a/lib/event/rpc/subsystem_rpc.c
+++ b/lib/event/rpc/subsystem_rpc.c
@@ -52,10 +52,6 @@ spdk_rpc_get_subsystems(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	TAILQ_FOREACH(subsystem, &g_subsystems, tailq) {
 		spdk_json_write_object_begin(w);
@@ -110,10 +106,8 @@ spdk_rpc_get_subsystem_config(struct spdk_jsonrpc_request *request,
 	free(req.name);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w) {
-		spdk_subsystem_config_json(w, subsystem);
-		spdk_jsonrpc_end_result(request, w);
-	}
+	spdk_subsystem_config_json(w, subsystem);
+	spdk_jsonrpc_end_result(request, w);
 }
 
 SPDK_RPC_REGISTER("get_subsystem_config", spdk_rpc_get_subsystem_config, SPDK_RPC_RUNTIME)
diff --git a/lib/event/subsystems/bdev/bdev_rpc.c b/lib/event/subsystems/bdev/bdev_rpc.c
index e30a0fdf7..a07153e06 100644
--- a/lib/event/subsystems/bdev/bdev_rpc.c
+++ b/lib/event/subsystems/bdev/bdev_rpc.c
@@ -87,10 +87,6 @@ spdk_rpc_set_bdev_options(struct spdk_jsonrpc_request *request, const struct spd
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
diff --git a/lib/event/subsystems/iscsi/iscsi_rpc.c b/lib/event/subsystems/iscsi/iscsi_rpc.c
index e1987ffd4..fdc5189b0 100644
--- a/lib/event/subsystems/iscsi/iscsi_rpc.c
+++ b/lib/event/subsystems/iscsi/iscsi_rpc.c
@@ -109,10 +109,6 @@ spdk_rpc_set_iscsi_options(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
diff --git a/lib/event/subsystems/nvmf/nvmf_rpc.c b/lib/event/subsystems/nvmf/nvmf_rpc.c
index c54c8ecbc..472c67839 100644
--- a/lib/event/subsystems/nvmf/nvmf_rpc.c
+++ b/lib/event/subsystems/nvmf/nvmf_rpc.c
@@ -303,10 +303,6 @@ spdk_rpc_get_nvmf_subsystems(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	subsystem = spdk_nvmf_subsystem_get_first(g_spdk_nvmf_tgt);
 	while (subsystem) {
@@ -342,10 +338,6 @@ spdk_rpc_nvmf_subsystem_started(struct spdk_nvmf_subsystem *subsystem,
 	struct spdk_json_write_ctx *w;
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -433,10 +425,6 @@ spdk_rpc_nvmf_subsystem_stopped(struct spdk_nvmf_subsystem *subsystem,
 	spdk_nvmf_subsystem_destroy(subsystem);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -576,10 +564,6 @@ nvmf_rpc_listen_resumed(struct spdk_nvmf_subsystem *subsystem,
 	nvmf_rpc_listener_ctx_free(ctx);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -860,10 +844,6 @@ nvmf_rpc_ns_resumed(struct spdk_nvmf_subsystem *subsystem,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_uint32(w, nsid);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -993,10 +973,6 @@ nvmf_rpc_remove_ns_resumed(struct spdk_nvmf_subsystem *subsystem,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1115,10 +1091,6 @@ nvmf_rpc_host_resumed(struct spdk_nvmf_subsystem *subsystem,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1321,10 +1293,6 @@ spdk_rpc_set_nvmf_target_max_subsystems(struct spdk_jsonrpc_request *request,
 	g_spdk_nvmf_tgt_max_subsystems = max_subsystems;
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1393,10 +1361,6 @@ spdk_rpc_set_nvmf_target_config(struct spdk_jsonrpc_request *request,
 	g_spdk_nvmf_tgt_conf = conf;
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1490,10 +1454,6 @@ nvmf_rpc_tgt_add_transport_done(void *cb_arg, int status)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1621,10 +1581,6 @@ spdk_rpc_get_nvmf_transports(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	transport = spdk_nvmf_transport_get_first(g_spdk_nvmf_tgt);
 	while (transport) {
diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c
index 965475e64..75a6617d3 100644
--- a/lib/iscsi/iscsi_rpc.c
+++ b/lib/iscsi/iscsi_rpc.c
@@ -57,10 +57,6 @@ spdk_rpc_get_initiator_groups(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	spdk_iscsi_init_grps_info_json(w);
 	spdk_json_write_array_end(w);
@@ -166,10 +162,6 @@ spdk_rpc_add_initiator_group(struct spdk_jsonrpc_request *request,
 	free_rpc_initiator_group(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -211,10 +203,6 @@ spdk_rpc_add_initiators_to_initiator_group(struct spdk_jsonrpc_request *request,
 	free_rpc_initiator_group(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -251,10 +239,6 @@ spdk_rpc_delete_initiators_from_initiator_group(struct spdk_jsonrpc_request *req
 	free_rpc_initiator_group(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -297,10 +281,6 @@ spdk_rpc_delete_initiator_group(struct spdk_jsonrpc_request *request,
 	spdk_iscsi_init_grp_destroy(ig);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -323,10 +303,6 @@ spdk_rpc_get_target_nodes(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	spdk_iscsi_tgt_nodes_info_json(w);
 	spdk_json_write_array_end(w);
@@ -511,10 +487,6 @@ spdk_rpc_construct_target_node(struct spdk_jsonrpc_request *request,
 	free_rpc_target_node(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -574,10 +546,8 @@ spdk_rpc_add_pg_ig_maps(struct spdk_jsonrpc_request *request,
 	free(req.name);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w != NULL) {
-		spdk_json_write_bool(w, true);
-		spdk_jsonrpc_end_result(request, w);
-	}
+	spdk_json_write_bool(w, true);
+	spdk_jsonrpc_end_result(request, w);
 	return;
 
 invalid:
@@ -626,10 +596,8 @@ spdk_rpc_delete_pg_ig_maps(struct spdk_jsonrpc_request *request,
 	free(req.name);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w != NULL) {
-		spdk_json_write_bool(w, true);
-		spdk_jsonrpc_end_result(request, w);
-	}
+	spdk_json_write_bool(w, true);
+	spdk_jsonrpc_end_result(request, w);
 	return;
 
 invalid:
@@ -728,10 +696,6 @@ spdk_rpc_get_portal_groups(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	spdk_iscsi_portal_grps_info_json(w);
 	spdk_json_write_array_end(w);
@@ -859,10 +823,8 @@ spdk_rpc_add_portal_group(struct spdk_jsonrpc_request *request,
 out:
 	if (rc == 0) {
 		w = spdk_jsonrpc_begin_result(request);
-		if (w != NULL) {
-			spdk_json_write_bool(w, true);
-			spdk_jsonrpc_end_result(request, w);
-		}
+		spdk_json_write_bool(w, true);
+		spdk_jsonrpc_end_result(request, w);
 	} else {
 		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
 
@@ -906,10 +868,6 @@ spdk_rpc_delete_portal_group(struct spdk_jsonrpc_request *request,
 	spdk_iscsi_portal_grp_release(pg);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -935,10 +893,6 @@ spdk_rpc_get_iscsi_connections(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	for (i = 0; i < MAX_ISCSI_CONNECTIONS; i++) {
@@ -1034,10 +988,6 @@ spdk_rpc_target_node_add_lun(struct spdk_jsonrpc_request *request,
 	free_rpc_target_lun(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -1106,10 +1056,6 @@ spdk_rpc_set_iscsi_target_node_auth(struct spdk_jsonrpc_request *request,
 	free_rpc_target_auth(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -1133,10 +1079,6 @@ spdk_rpc_get_iscsi_global_params(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_iscsi_opts_info_json(w);
 
 	spdk_jsonrpc_end_result(request, w);
@@ -1182,10 +1124,6 @@ spdk_rpc_set_iscsi_discovery_auth(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1321,10 +1259,6 @@ spdk_rpc_add_iscsi_auth_group(struct spdk_jsonrpc_request *request,
 	free_rpc_auth_group(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1370,10 +1304,6 @@ spdk_rpc_delete_iscsi_auth_group(struct spdk_jsonrpc_request *request,
 	pthread_mutex_unlock(&g_spdk_iscsi.mutex);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1450,10 +1380,6 @@ spdk_rpc_add_secret_to_iscsi_auth_group(struct spdk_jsonrpc_request *request,
 	free_rpc_add_auth_secret(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1522,10 +1448,6 @@ spdk_rpc_delete_secret_from_iscsi_auth_group(struct spdk_jsonrpc_request *reques
 	free_rpc_delete_auth_secret(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
@@ -1545,10 +1467,6 @@ spdk_rpc_get_iscsi_auth_groups(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	spdk_iscsi_auth_groups_info_json(w);
 	spdk_json_write_array_end(w);
diff --git a/lib/log/rpc/log_rpc.c b/lib/log/rpc/log_rpc.c
index 30ab4a3ff..7849ee7f3 100644
--- a/lib/log/rpc/log_rpc.c
+++ b/lib/log/rpc/log_rpc.c
@@ -122,10 +122,6 @@ spdk_rpc_set_log_print_level(struct spdk_jsonrpc_request *request,
 	free_rpc_log_level(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -160,10 +156,6 @@ spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_string(w, name);
 
 	spdk_jsonrpc_end_result(request, w);
@@ -196,10 +188,6 @@ spdk_rpc_set_log_level(struct spdk_jsonrpc_request *request,
 	free_rpc_log_level(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -233,10 +221,6 @@ spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_string(w, name);
 
 	spdk_jsonrpc_end_result(request, w);
@@ -265,10 +249,6 @@ spdk_rpc_set_log_flag(struct spdk_jsonrpc_request *request,
 	free_rpc_log_flag(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -302,10 +282,6 @@ spdk_rpc_clear_log_flag(struct spdk_jsonrpc_request *request,
 	free_rpc_log_flag(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -332,10 +308,6 @@ spdk_rpc_get_log_flags(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_object_begin(w);
 	flag = spdk_log_get_first_flag();
 	while (flag) {
diff --git a/lib/nbd/nbd_rpc.c b/lib/nbd/nbd_rpc.c
index 05e5a2d2b..ed8ab55d8 100644
--- a/lib/nbd/nbd_rpc.c
+++ b/lib/nbd/nbd_rpc.c
@@ -162,10 +162,6 @@ spdk_rpc_start_nbd_done(void *cb_arg, struct spdk_nbd_disk *nbd, int rc)
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_string(w, spdk_nbd_get_path(nbd));
 	spdk_jsonrpc_end_result(request, w);
 
@@ -261,14 +257,9 @@ nbd_disconnect_thread(void *arg)
 	nbd_disconnect(thd_arg->nbd);
 
 	w = spdk_jsonrpc_begin_result(thd_arg->request);
-	if (w == NULL) {
-		goto out;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(thd_arg->request, w);
 
-out:
 	free(thd_arg);
 	pthread_exit(NULL);
 }
@@ -399,10 +390,6 @@ spdk_rpc_get_nbd_disks(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	if (nbd != NULL) {
diff --git a/lib/net/net_rpc.c b/lib/net/net_rpc.c
index fef8dd3df..d2b8e9e47 100644
--- a/lib/net/net_rpc.c
+++ b/lib/net/net_rpc.c
@@ -78,10 +78,6 @@ spdk_rpc_add_ip_address(struct spdk_jsonrpc_request *request,
 	free_rpc_ip_address(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -113,10 +109,6 @@ spdk_rpc_delete_ip_address(struct spdk_jsonrpc_request *request,
 	free_rpc_ip_address(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -145,10 +137,6 @@ spdk_rpc_get_interfaces(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	TAILQ_FOREACH(ifc, interface_head, tailq) {
diff --git a/lib/rpc/rpc.c b/lib/rpc/rpc.c
index dbd2f8865..c159b7813 100644
--- a/lib/rpc/rpc.c
+++ b/lib/rpc/rpc.c
@@ -366,10 +366,6 @@ spdk_rpc_get_methods(struct spdk_jsonrpc_request *request, const struct spdk_jso
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 	SLIST_FOREACH(m, &g_rpc_methods, slist) {
 		if (req.current && ((m->state_mask & g_rpc_state) != g_rpc_state)) {
diff --git a/lib/scsi/scsi_rpc.c b/lib/scsi/scsi_rpc.c
index eaf8bcd97..cca6a0932 100644
--- a/lib/scsi/scsi_rpc.c
+++ b/lib/scsi/scsi_rpc.c
@@ -52,10 +52,6 @@ spdk_rpc_get_scsi_devices(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_array_begin(w);
 
 	for (i = 0; i < SPDK_SCSI_MAX_DEVS; i++) {
diff --git a/lib/trace/rpc/trace_rpc.c b/lib/trace/rpc/trace_rpc.c
index 41a1fe43f..9a2f02dcd 100644
--- a/lib/trace/rpc/trace_rpc.c
+++ b/lib/trace/rpc/trace_rpc.c
@@ -75,10 +75,6 @@ spdk_rpc_enable_tpoint_group(struct spdk_jsonrpc_request *request,
 	free_rpc_tpoint_group(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -115,10 +111,6 @@ spdk_rpc_disable_tpoint_group(struct spdk_jsonrpc_request *request,
 	free_rpc_tpoint_group(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -147,10 +139,6 @@ spdk_rpc_get_tpoint_group_mask(struct spdk_jsonrpc_request *request,
 	}
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	tpoint_group_mask = spdk_trace_get_tpoint_group_mask();
 
 	spdk_json_write_object_begin(w);
diff --git a/lib/vhost/vhost_rpc.c b/lib/vhost/vhost_rpc.c
index a21db8923..7eccc2a6a 100644
--- a/lib/vhost/vhost_rpc.c
+++ b/lib/vhost/vhost_rpc.c
@@ -85,10 +85,6 @@ spdk_rpc_construct_vhost_scsi_controller(struct spdk_jsonrpc_request *request,
 	free_rpc_vhost_scsi_ctrlr(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -154,10 +150,6 @@ spdk_rpc_add_vhost_scsi_lun(struct spdk_jsonrpc_request *request,
 	free_rpc_add_vhost_scsi_ctrlr_lun(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_int32(w, rc);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -192,10 +184,6 @@ spdk_rpc_remove_vhost_scsi_target_finish_cb(struct spdk_vhost_dev *vdev, void *a
 	struct spdk_json_write_ctx *w;
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return -1;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return 0;
@@ -290,10 +278,6 @@ spdk_rpc_construct_vhost_blk_controller(struct spdk_jsonrpc_request *request,
 	free_rpc_vhost_blk_ctrlr(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -354,10 +338,6 @@ spdk_rpc_remove_vhost_controller(struct spdk_jsonrpc_request *request,
 	free_rpc_remove_vhost_ctrlr(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 
@@ -435,11 +415,6 @@ spdk_rpc_get_vhost_controllers(struct spdk_jsonrpc_request *request,
 		free_rpc_get_vhost_ctrlrs(&req);
 
 		w = spdk_jsonrpc_begin_result(request);
-		if (w == NULL) {
-			spdk_vhost_unlock();
-			return;
-		}
-
 		spdk_json_write_array_begin(w);
 
 		_spdk_rpc_get_vhost_controller(w, vdev);
@@ -529,10 +504,8 @@ spdk_rpc_set_vhost_controller_coalescing(struct spdk_jsonrpc_request *request,
 	free_rpc_set_vhost_controllers_event_coalescing(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w != NULL) {
-		spdk_json_write_bool(w, true);
-		spdk_jsonrpc_end_result(request, w);
-	}
+	spdk_json_write_bool(w, true);
+	spdk_jsonrpc_end_result(request, w);
 
 	return;
 
@@ -588,10 +561,6 @@ spdk_rpc_construct_vhost_nvme_controller(struct spdk_jsonrpc_request *request,
 	free_rpc_vhost_nvme_ctrlr(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;
@@ -655,10 +624,6 @@ spdk_rpc_add_vhost_nvme_ns(struct spdk_jsonrpc_request *request,
 	free_rpc_add_vhost_nvme_ctrlr_ns(&req);
 
 	w = spdk_jsonrpc_begin_result(request);
-	if (w == NULL) {
-		return;
-	}
-
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 	return;