diff --git a/drivers/video/tegra/nvmap/nvmap_dmabuf.c b/drivers/video/tegra/nvmap/nvmap_dmabuf.c
index 31232523..f6c209f5 100644
--- a/drivers/video/tegra/nvmap/nvmap_dmabuf.c
+++ b/drivers/video/tegra/nvmap/nvmap_dmabuf.c
@@ -624,7 +624,11 @@ struct dma_buf *__nvmap_make_dmabuf(struct nvmap_client *client,
 		err = PTR_ERR(dmabuf);
 		goto err_export;
 	}
-	nvmap_handle_get(handle);
+
+	if (!nvmap_handle_get(handle)) {
+		err = -EINVAL;
+		goto err_export;
+	}
 
 	trace_nvmap_make_dmabuf(client->name, handle, dmabuf);
 	return dmabuf;
diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index 6eabdfec..9953b78c 100644
--- a/drivers/video/tegra/nvmap/nvmap_handle.c
+++ b/drivers/video/tegra/nvmap/nvmap_handle.c
@@ -403,9 +403,13 @@ struct nvmap_handle_ref *nvmap_duplicate_handle(struct nvmap_client *client,
 
 	if (is_ro) {
 		ref->is_ro = true;
+		if (!h->dmabuf_ro)
+			goto exit;
 		get_dma_buf(h->dmabuf_ro);
 	} else {
 		ref->is_ro = false;
+		if (!h->dmabuf)
+			goto exit;
 		get_dma_buf(h->dmabuf);
 	}
 
@@ -413,6 +417,11 @@ out:
 	NVMAP_TAG_TRACE(trace_nvmap_duplicate_handle,
 		NVMAP_TP_ARGS_CHR(client, h, ref));
 	return ref;
+
+exit:
+	pr_err("dmabuf is NULL\n");
+	kfree(ref);
+	return ERR_PTR(-EINVAL);
 }
 
 struct nvmap_handle_ref *nvmap_create_handle_from_id(
diff --git a/drivers/video/tegra/nvmap/nvmap_sci_ipc.c b/drivers/video/tegra/nvmap/nvmap_sci_ipc.c
index 84bb3600..a808a2de 100644
--- a/drivers/video/tegra/nvmap/nvmap_sci_ipc.c
+++ b/drivers/video/tegra/nvmap/nvmap_sci_ipc.c
@@ -186,8 +186,10 @@ int nvmap_create_sci_ipc_id(struct nvmap_client *client,
 	}
 unlock:
 	mutex_unlock(&nvmapsciipc->mlock);
-	if (!ret)
-		(void)nvmap_handle_get(h);
+	if (!ret) {
+		if (!nvmap_handle_get(h))
+			return -EINVAL;
+	}
 
 	return ret;
 }