diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/Makefile b/openair-cn/NAS/EURECOM-NAS/src/emm/Makefile
index 49c3ba2cbe..b39a05a253 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/Makefile
@@ -5,8 +5,20 @@ endif
 include $(PROJDIR)/Makerules
 include $(PROJDIR)/Makefile.inc
 
-INCLUDES = -I. -I$(INCDIR) -I$(UTILDIR) -I$(USIMAPIDIR) -I$(MMEAPIDIR) \
-	-I$(ESMDIR) -I$(EMMSAPDIR) -I$(ESMDIR) -I$(ESMSAPDIR) -I$(EMMMSGDIR) -I$(IESDIR)
+INCLUDES = -I. \
+    -I$(INCDIR) \
+    -I$(UTILDIR) \
+    -I$(USIMAPIDIR) \
+    -I$(MMEAPIDIR) \
+	-I$(ESMDIR) \
+	-I$(EMMSAPDIR) \
+	-I$(ESMDIR) \
+	-I$(ESMSAPDIR) \
+	-I$(EMMMSGDIR) \
+	-I$(IESDIR) \
+    -I$(OPENAIRCN_DIR)/COMMON \
+    -I$(OPENAIRCN_DIR)/SECU
+	
 
 all: $(OBJS)
 	@$(CD) $(EMMMSGDIR) && $(MAKE)
diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/SecurityModeControl.c b/openair-cn/NAS/EURECOM-NAS/src/emm/SecurityModeControl.c
index 2910faa169..d04f6f221a 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/SecurityModeControl.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/SecurityModeControl.c
@@ -435,9 +435,9 @@ int emm_proc_security_mode_control(unsigned int ueid, int ksi, int eea, int eia,
             if ( ! emm_ctx->security->knas_int.value) {
                 emm_ctx->security->knas_int.value = malloc(AUTH_KNAS_INT_SIZE);
             } else {
-                AssertFatal(
-                    emm_ctx->security->knas_int.length >= AUTH_KNAS_INT_SIZE,
+            	LOG_TRACE(ERROR,
                     " TODO realloc emm_ctx->security->knas_int OctetString");
+                LOG_FUNC_RETURN (RETURNerror);
             }
             emm_ctx->security->knas_int.length = AUTH_KNAS_INT_SIZE;
             derive_key_nas(
@@ -449,9 +449,9 @@ int emm_proc_security_mode_control(unsigned int ueid, int ksi, int eea, int eia,
             if ( ! emm_ctx->security->knas_enc.value) {
                 emm_ctx->security->knas_enc.value = malloc(AUTH_KNAS_ENC_SIZE);
             } else {
-                AssertFatal(
-                    emm_ctx->security->knas_enc.length >= AUTH_KNAS_ENC_SIZE,
+            	LOG_TRACE(ERROR,
                     " TODO realloc emm_ctx->security->knas_enc OctetString");
+                LOG_FUNC_RETURN (RETURNerror);
             }
             emm_ctx->security->knas_enc.length = AUTH_KNAS_ENC_SIZE;
             derive_key_nas(