diff --git a/src/system/kernel/cache/block_cache.cpp b/src/system/kernel/cache/block_cache.cpp
index 77e3ea8639..52d9602a76 100644
--- a/src/system/kernel/cache/block_cache.cpp
+++ b/src/system/kernel/cache/block_cache.cpp
@@ -376,7 +376,8 @@ block_cache::InitCheck()
 void
 block_cache::Free(void *buffer)
 {
-	object_cache_free(buffer_cache, buffer);
+	if (buffer != NULL)
+		object_cache_free(buffer_cache, buffer);
 }