diff --git a/src/gallium/auxiliary/util/u_handle_table.c b/src/gallium/auxiliary/util/u_handle_table.c
index ab427ee371d..d25872972aa 100644
--- a/src/gallium/auxiliary/util/u_handle_table.c
+++ b/src/gallium/auxiliary/util/u_handle_table.c
@@ -175,6 +175,10 @@ handle_table_set(struct handle_table *ht,
    if(!handle || handle > ht->size)
       return 0;
 
+   assert(object);
+   if(!object)
+      return 0;
+   
    index = handle - 1;
 
    /* grow the table if necessary */