diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
index b72ad5ef1..3a70dd0a5 100644
--- a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
+++ b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
@@ -137,7 +137,7 @@ ipa_join(Slapi_PBlock *pb)
     int is_root=0;
     char *krbLastPwdChange = NULL;
     char *fqdn = NULL;
-    Slapi_Mods *smods;
+    Slapi_Mods *smods = NULL;
     char *attrlist[] = {"fqdn", "krbPrincipalKey", "krbLastPwdChange", "krbPrincipalName", NULL };
     char * filter;
 
@@ -329,8 +329,13 @@ free_and_return:
     if (pbtm) {
         slapi_pblock_destroy(pbtm);
     }
+    if (smods) {
+        slapi_mods_free(&smods);
+    }
 
     if (krbLastPwdChange) slapi_ch_free_string(&krbLastPwdChange);
+    if (fqdn) slapi_ch_free_string(&fqdn);
+    if (sdn) slapi_sdn_free(&sdn);
 
     LOG("%s", errMesg ? errMesg : "success\n");
     slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);