diff --git a/ChangeLog b/ChangeLog
index 24f4b00a1..3a6cb7b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSURLHandle.m: ([resourceData]) make sure value returned
+	is autoreleased.
+
 2007-01-16  Nicola Pero <nicola.pero@meta-innovation.com>
 
 	* configure.ac: Fixed url of build guide given in error message
diff --git a/Source/NSURLHandle.m b/Source/NSURLHandle.m
index f06b93be0..46e4f01ea 100644
--- a/Source/NSURLHandle.m
+++ b/Source/NSURLHandle.m
@@ -526,24 +526,23 @@ static Class		NSURLHandleClass = 0;
  */
 - (NSData*) resourceData
 {
-  if (_status == NSURLHandleLoadSucceeded)
+  if (_status != NSURLHandleLoadSucceeded)
     {
-      return [self availableResourceData];
-    }
-  else if (_status == NSURLHandleLoadInProgress)
-    {
-      return nil;
-    }
-  else
-    {
-      NSData	*d = [self loadInForeground];
-
-      if (d != nil)
+      if (_status == NSURLHandleLoadInProgress)
 	{
-	  ASSIGNCOPY(_data, d);
+	  return nil;
+	}
+      else
+	{
+	  NSData	*d = [self loadInForeground];
+
+	  if (d != nil)
+	    {
+	      ASSIGNCOPY(_data, d);
+	    }
 	}
-      return _data;
     }
+  return [self availableResourceData];
 }
 
 /**