--- src0/api/api_msg.c	2008-03-19 03:48:24.000000000 -0400
+++ src1/api/api_msg.c	2008-03-19 03:47:57.000000000 -0400
@@ -817,7 +817,7 @@
             if (msg->conn->recvmbox != SYS_MBOX_NULL) {
               /** @todo: should we drain the recvmbox here? */
               sys_mbox_free(msg->conn->recvmbox);
-              msg->conn->recvmbox = NULL;
+              msg->conn->recvmbox = SYS_MBOX_NULL;
             }
             if (msg->conn->acceptmbox == SYS_MBOX_NULL) {
               if ((msg->conn->acceptmbox = sys_mbox_new(DEFAULT_ACCEPTMBOX_SIZE)) == SYS_MBOX_NULL) {