diff --git a/src/amf/namf-handler.c b/src/amf/namf-handler.c
index 1b062e48d..1e3b42536 100644
--- a/src/amf/namf-handler.c
+++ b/src/amf/namf-handler.c
@@ -378,6 +378,8 @@ int amf_namf_comm_handle_n1_n2_message_transfer(
         }
 
         if (CM_IDLE(amf_ue)) {
+            if (n1buf)
+                ogs_pkbuf_free(n1buf);
             if (n2buf)
                 ogs_pkbuf_free(n2buf);
 
diff --git a/src/smf/npcf-handler.c b/src/smf/npcf-handler.c
index c682c3d43..621f71f85 100644
--- a/src/smf/npcf-handler.c
+++ b/src/smf/npcf-handler.c
@@ -445,8 +445,9 @@ bool smf_npcf_smpolicycontrol_handle_create(
     /* Check if selected UPF is associated with SMF */
     ogs_assert(sess->pfcp_node);
     if (!OGS_FSM_CHECK(&sess->pfcp_node->sm, smf_pfcp_state_associated)) {
-        ogs_error("[%s] No associated UPF", smf_ue->supi);
-        return false;
+        strerror = ogs_msprintf("[%s:%d] No associated UPF",
+                smf_ue->supi, sess->psi);
+        goto cleanup;
     }
 
     /* Remove all previous QoS flow */