diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 16cc08e1..41573ee0 100644
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -1,4 +1,5 @@
-06/29/2024 Version 4.5.0-beta4
+07/12/2024 Version 4.5.0-beta4
+    - NULL Pointer Dereference in parse_endpoints (#888)
     - tcpreplay --include / --exclude to control which packets are replayed (#884)
     - add -W (--suppress-warnings) option to suppress warning messages (#878)
     - AF_XDP compile issue due to merge issue (#876)
diff --git a/src/common/cidr.c b/src/common/cidr.c
index d4fc302b..795b5e7f 100644
--- a/src/common/cidr.c
+++ b/src/common/cidr.c
@@ -337,6 +337,8 @@ parse_endpoints(tcpr_cidrmap_t **cidrmap1, tcpr_cidrmap_t **cidrmap2, const char
         /* do again with the second IP */
         memset(newmap, '\0', NEWMAP_LEN);
         map = strtok_r(NULL, ":", &token);
+        if (map == NULL)
+            goto done;
 
         strlcpy(newmap, "0.0.0.0/0:", NEWMAP_LEN);
         strlcat(newmap, map, NEWMAP_LEN);