diff --git a/src/network/networksocket.c b/src/network/networksocket.c
index 505962d..d890681 100644
--- a/src/network/networksocket.c
+++ b/src/network/networksocket.c
@@ -70,11 +70,6 @@ void *receive_msg(void *args) {
             continue;
         }
 
-        // TODO: recv_string is a fixed array.  Should test be here?
-        if (recv_string == NULL) {
-            return 0;
-        }
-
         if (strlen(recv_string) <= 0) {
             return 0;
         }
@@ -93,11 +88,6 @@ void *receive_msg_enc(void *args) {
             continue;
         }
 
-        // TODO: recv_string is a fixed array.  Should test be here?
-        if (recv_string == NULL) {
-            return 0;
-        }
-
         if (strlen(recv_string) <= 0) {
             return 0;
         }
diff --git a/src/utils/memory_utils.c b/src/utils/memory_utils.c
index bb164f6..7903d4a 100644
--- a/src/utils/memory_utils.c
+++ b/src/utils/memory_utils.c
@@ -33,7 +33,7 @@ void* ret = NULL;
     case DAWN_REALLOC:
         ret = realloc(ptr, size);
         if (ret != NULL)
-          dawn_memory_unregister(DAWN_REALLOC, file, line, ptr);
+          dawn_memory_unregister(DAWN_REALLOC, file, line, ret);
         break;
     case DAWN_CALLOC:
         ret = calloc(nmemb, size);