diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index cd4ca361..c3a82046 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -1270,6 +1270,8 @@ gen4_emit_state_base_address(struct sna *sna)
 static void
 gen4_emit_invariant(struct sna *sna)
 {
+	assert(sna->kgem.surface == sna->kgem.batch_size);
+
 	if (sna->kgem.gen >= 45)
 		OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
 	else
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index c79903b9..925e3553 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1155,6 +1155,7 @@ static void __kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo)
 
 	assert(list_is_empty(&bo->list));
 	assert(bo->refcnt == 0);
+	assert(!bo->purged);
 
 	bo->binding.offset = 0;
 	kgem_bo_clear_scanout(kgem, bo);