diff --git a/buffer.c b/buffer.c
index a0a848e..ed37a2d 100644
--- a/buffer.c
+++ b/buffer.c
@@ -548,6 +548,8 @@ Buffer* b_pack(Buffer* const pBD) {
  * Return value: N/A
  */
 void b_free(Buffer* const pBD) {
-    free(pBD->cb_head);
-    free(pBD);
+    if (pBD){
+        free(pBD->cb_head);
+        free(pBD);
+    }
 }