diff --git a/ChangeLog b/ChangeLog
index 3707b6259..ec6f16d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-26  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSHTTPURLHandle.m: remove wProperties and wData from
+	handle in sync.
+
 2005-04-25  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/defaults.m: Fix bug writing defaults whose values should be
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 6f6f5ad61..0cced83cb 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -375,7 +375,6 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
     {
       [s appendFormat: @"%@: %@\r\n", key, [wProperties objectForKey: key]];
     }
-  [wProperties removeAllObjects];
   [s appendString: @"\r\n"];
   buf = [[s dataUsingEncoding: NSASCIIStringEncoding] mutableCopy];
 
@@ -505,6 +504,7 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
 	  r = NSMakeRange(bodyPos, [d length] - bodyPos);
 	  bodyPos = 0;
 	  DESTROY(wData);
+	  [wProperties removeAllObjects];
 	  [self didLoadBytes: [d subdataWithRange: r]
 		loadComplete: YES];
 	}
@@ -578,6 +578,7 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
 - (void) endLoadInBackground
 {
   DESTROY(wData);
+  [wProperties removeAllObjects];
   if (connectionState != idle)
     {
       NSNotificationCenter	*nc = [NSNotificationCenter defaultCenter];
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
index c86b7f319..787c958b5 100644
--- a/Source/NSUserDefaults.m
+++ b/Source/NSUserDefaults.m
@@ -540,7 +540,7 @@ static BOOL setSharedDefaults = NO;     /* Flag to prevent infinite recursion */
   if (added_lang == NO)
     {
       /* Ack! We should never get here */
-      NSLog(@"Improper installation: No language locale found");
+      NSWarnMLog(@"Improper installation: No language locale found");
       [sharedDefaults registerDefaults: [self _unlocalizedDefaults]];
     }
   RETAIN(sharedDefaults);