diff --git a/src/core/lib/utils/memory.c b/src/core/lib/utils/memory.c
index 71dc4bf..2aa0b79 100644
--- a/src/core/lib/utils/memory.c
+++ b/src/core/lib/utils/memory.c
@@ -66,9 +66,9 @@ void remove_node(node_t *node) //valgrind says this causes memory leaks ('still
     if (node -> next != NULL)
     {
         node -> next -> last = node -> last;
-    } else
+    } else if (node -> last != NULL)
     {
-        node -> last -> next = NULL; //idk there could be some bugz
+        node -> last -> next = NULL;
     }
 
     if (head -> next == NULL) //LIST IS EMPTY NOW => DEALLOCATE