1 files changed, 4 insertions, 2 deletions
diff --git a/src/clients/kpasswd/kpasswd.c b/src/clients/kpasswd/kpasswd.c
index 293d68fbb2..da66102daf 100644
--- a/src/clients/kpasswd/kpasswd.c
+++ b/src/clients/kpasswd/kpasswd.c
@@ -139,8 +139,10 @@ int main(int argc, char *argv[])
       exit(2);
    }
 
-   free(result_string.data);
-   free(result_code_string.data);
+   if (result_string.data != NULL) 
+       free(result_string.data);
+   if (result_code_string.data != NULL)
+       free(result_code_string.data);
 
    printf("Password changed.\n");
    exit(0);