diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index 74b0fbd3..eaa42527 100644
--- a/drivers/video/tegra/nvmap/nvmap_handle.c
+++ b/drivers/video/tegra/nvmap/nvmap_handle.c
@@ -319,6 +319,7 @@ static void remove_handle_ref(struct nvmap_client *client,
 {
 	nvmap_ref_lock(client);
 	atomic_dec(&ref->handle->share_count);
+	BUG_ON(client->handle_count == 0);
 	client->handle_count--;
 	rb_erase(&ref->node, &client->handle_refs);
 	nvmap_ref_unlock(client);