diff --git a/src/k_profiles.c b/src/k_profiles.c
index 62f561587..5a9ddd75a 100644
--- a/src/k_profiles.c
+++ b/src/k_profiles.c
@@ -300,8 +300,7 @@ void PR_LoadProfiles(void)
 		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;
 
-		Z_Free(save.buffer);
-		save.p = NULL;
+		P_SaveBufferFree(&save);
 		I_Error("Not a valid Profile file.\nDelete %s (maybe in %s) and try again.", PROFILESFILE, gdfolder);
 	}
 	save.p += headerlen;
@@ -309,8 +308,7 @@ void PR_LoadProfiles(void)
 	version = READUINT8(save.p);
 	if (version > PROFILEVER)
 	{
-		Z_Free(save.buffer);
-		save.p = NULL;
+		P_SaveBufferFree(&save);
 		I_Error("Existing %s is from the future! (expected %d, got %d)", PROFILESFILE, PROFILEVER, version);
 	}
 
diff --git a/src/p_setup.c b/src/p_setup.c
index 37ca56328..42ff2f33d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -749,8 +749,7 @@ void P_WriteThings(void)
 	filename = va("newthings-%s.lmp", G_BuildMapName(gamemap));
 
 	FIL_WriteFile(filename, save.buffer, length);
-	free(save.buffer);
-	save.p = NULL;
+	P_SaveBufferFree(&save);
 
 	CONS_Printf(M_GetText("%s saved.\n"), filename);
 }