diff --git a/lib/core/ogs-sockaddr.c b/lib/core/ogs-sockaddr.c
index 52bf170050..9307cab34f 100644
--- a/lib/core/ogs-sockaddr.c
+++ b/lib/core/ogs-sockaddr.c
@@ -373,7 +373,7 @@ const char *ogs_inet_ntop(void *sa, char *buf, int buflen)
                 INET6_ADDRSTRLEN);
     default:
         ogs_fatal("Unknown family(%d)", family);
-        ogs_abort();
+        // ogs_abort();
         return NULL;
     }
 }
diff --git a/src/sgwc/s5c-handler.c b/src/sgwc/s5c-handler.c
index cf29f96a1a..46335f8d4c 100644
--- a/src/sgwc/s5c-handler.c
+++ b/src/sgwc/s5c-handler.c
@@ -484,6 +484,12 @@ void sgwc_s5c_handle_delete_session_response(
     /********************
      * Check Transaction
      ********************/
+    // if we don't have a transaction to delete, move on
+    if (!s5c_xact || !s11_xact) {
+        ogs_error("Cannot find transaction to delete!");
+        return;
+    }
+
     ogs_assert(s5c_xact);
     s11_xact = s5c_xact->assoc_xact;
     ogs_assert(s11_xact);
diff --git a/src/sgwc/sxa-handler.c b/src/sgwc/sxa-handler.c
index 37d0af31df..10145e338e 100644
--- a/src/sgwc/sxa-handler.c
+++ b/src/sgwc/sxa-handler.c
@@ -136,8 +136,12 @@ static void sgwc_sxa_handle_session_reestablishment(
 
     ogs_pfcp_f_seid_t *up_f_seid = NULL;
     up_f_seid = pfcp_rsp->up_f_seid.data;
-    ogs_assert(up_f_seid);
-    sess->sgwu_sxa_seid = be64toh(up_f_seid->seid);
+    //ogs_assert(up_f_seid);
+    if (!up_f_seid) {
+        ogs_error("We do not have a stored F-SEID?!?");
+    } else {
+        sess->sgwu_sxa_seid = be64toh(up_f_seid->seid);        
+    }
 
     stats_update_sgwc_sessions();