diff --git a/std/rb.zig b/std/rb.zig
index 0b28550a13..b5935a2eac 100644
--- a/std/rb.zig
+++ b/std/rb.zig
@@ -93,7 +93,8 @@ pub const Node = struct {
         comptime {
             assert(@alignOf(*Node) >= 2);
         }
-        return @intToPtr(*Node, node.parent_and_color & ~mask);
+        const maybe_ptr = node.parent_and_color & ~mask;
+        return if (maybe_ptr == 0) null else @intToPtr(*Node, maybe_ptr);
     }
 
     fn setColor(node: *Node, color: Color) void {
diff --git a/std/std.zig b/std/std.zig
index 350f0fb437..e48586d873 100644
--- a/std/std.zig
+++ b/std/std.zig
@@ -105,6 +105,7 @@ test "std" {
     _ = @import("packed_int_array.zig");
     _ = @import("priority_queue.zig");
     _ = @import("rand.zig");
+    _ = @import("rb.zig");
     _ = @import("sort.zig");
     _ = @import("testing.zig");
     _ = @import("thread.zig");