Index: uspace/lib/cpp/include/internal/rbtree.hpp
===================================================================
--- uspace/lib/cpp/include/internal/rbtree.hpp	(revision 55d62239cd82d99b50b239c8f69b865d2f94e571)
+++ uspace/lib/cpp/include/internal/rbtree.hpp	(revision adb7dfe14b1e52d137819547acc03d9b6471e731)
@@ -61,8 +61,4 @@
             using node_type = rbtree_node<value_type>;
 
-            // TODO: make find/bounds etc templated with key type
-            //       for transparent comparators and leave their management for the
-            //       outer containers
-
             rbtree(const key_compare& kcmp = key_compare{})
                 : root_{nullptr}, size_{}, key_compare_{},
@@ -382,7 +378,13 @@
             void insert_node(node_type* node, node_type* parent)
             {
+                if (!node)
+                    return;
+
                 ++size_;
                 if (!parent)
+                {
+                    node->color = rbcolor::black;
                     root_ = node;
+                }
                 else
                 {