diff --git a/plug-ins/common/jpeg.c b/plug-ins/common/jpeg.c
index 7dc0005146..e536ff2bb7 100644
--- a/plug-ins/common/jpeg.c
+++ b/plug-ins/common/jpeg.c
@@ -535,7 +535,7 @@ load_image (char *filename, GRunModeType runmode)
   /* if we had any comments then make a parasite for them */
   if(local_image_comments) {
     char *string=local_image_comments->str;
-    g_string_free(local_image_comments,FALSE);
+    g_string_free(local_image_comments,FALSE); local_image_comments = NULL;
     comment_parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT,
 				    strlen(string)+1,string);
   } else {
diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c
index 7dc0005146..e536ff2bb7 100644
--- a/plug-ins/jpeg/jpeg-load.c
+++ b/plug-ins/jpeg/jpeg-load.c
@@ -535,7 +535,7 @@ load_image (char *filename, GRunModeType runmode)
   /* if we had any comments then make a parasite for them */
   if(local_image_comments) {
     char *string=local_image_comments->str;
-    g_string_free(local_image_comments,FALSE);
+    g_string_free(local_image_comments,FALSE); local_image_comments = NULL;
     comment_parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT,
 				    strlen(string)+1,string);
   } else {
diff --git a/plug-ins/jpeg/jpeg-load.h b/plug-ins/jpeg/jpeg-load.h
index 7dc0005146..e536ff2bb7 100644
--- a/plug-ins/jpeg/jpeg-load.h
+++ b/plug-ins/jpeg/jpeg-load.h
@@ -535,7 +535,7 @@ load_image (char *filename, GRunModeType runmode)
   /* if we had any comments then make a parasite for them */
   if(local_image_comments) {
     char *string=local_image_comments->str;
-    g_string_free(local_image_comments,FALSE);
+    g_string_free(local_image_comments,FALSE); local_image_comments = NULL;
     comment_parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT,
 				    strlen(string)+1,string);
   } else {
diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c
index 7dc0005146..e536ff2bb7 100644
--- a/plug-ins/jpeg/jpeg-save.c
+++ b/plug-ins/jpeg/jpeg-save.c
@@ -535,7 +535,7 @@ load_image (char *filename, GRunModeType runmode)
   /* if we had any comments then make a parasite for them */
   if(local_image_comments) {
     char *string=local_image_comments->str;
-    g_string_free(local_image_comments,FALSE);
+    g_string_free(local_image_comments,FALSE); local_image_comments = NULL;
     comment_parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT,
 				    strlen(string)+1,string);
   } else {
diff --git a/plug-ins/jpeg/jpeg-save.h b/plug-ins/jpeg/jpeg-save.h
index 7dc0005146..e536ff2bb7 100644
--- a/plug-ins/jpeg/jpeg-save.h
+++ b/plug-ins/jpeg/jpeg-save.h
@@ -535,7 +535,7 @@ load_image (char *filename, GRunModeType runmode)
   /* if we had any comments then make a parasite for them */
   if(local_image_comments) {
     char *string=local_image_comments->str;
-    g_string_free(local_image_comments,FALSE);
+    g_string_free(local_image_comments,FALSE); local_image_comments = NULL;
     comment_parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT,
 				    strlen(string)+1,string);
   } else {
diff --git a/plug-ins/jpeg/jpeg.c b/plug-ins/jpeg/jpeg.c
index 7dc0005146..e536ff2bb7 100644
--- a/plug-ins/jpeg/jpeg.c
+++ b/plug-ins/jpeg/jpeg.c
@@ -535,7 +535,7 @@ load_image (char *filename, GRunModeType runmode)
   /* if we had any comments then make a parasite for them */
   if(local_image_comments) {
     char *string=local_image_comments->str;
-    g_string_free(local_image_comments,FALSE);
+    g_string_free(local_image_comments,FALSE); local_image_comments = NULL;
     comment_parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT,
 				    strlen(string)+1,string);
   } else {
diff --git a/plug-ins/jpeg/jpeg.h b/plug-ins/jpeg/jpeg.h
index 7dc0005146..e536ff2bb7 100644
--- a/plug-ins/jpeg/jpeg.h
+++ b/plug-ins/jpeg/jpeg.h
@@ -535,7 +535,7 @@ load_image (char *filename, GRunModeType runmode)
   /* if we had any comments then make a parasite for them */
   if(local_image_comments) {
     char *string=local_image_comments->str;
-    g_string_free(local_image_comments,FALSE);
+    g_string_free(local_image_comments,FALSE); local_image_comments = NULL;
     comment_parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT,
 				    strlen(string)+1,string);
   } else {