diff --git a/ChangeLog b/ChangeLog
index 46b23b0ce..270499183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-17  Matt Rice <ratmice@yahoo.com>
+
+	* Source/NSDocument.m (-initWithContentsOfFile:ofType:): Set the
+	file name and type before attempting to read the document.
+
 2006-09-17  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSTableView.m (-_isCellEditableColumn:row:): Correced
diff --git a/Source/NSDocument.m b/Source/NSDocument.m
index d6fdfa8f6..acc6fc670 100644
--- a/Source/NSDocument.m
+++ b/Source/NSDocument.m
@@ -94,12 +94,10 @@
   self = [self init];
   if (self != nil)
     {
-      if ([self readFromFile: fileName ofType: fileType])
-	{
-	  [self setFileType: fileType];
-	  [self setFileName: fileName];
-	}
-      else
+      [self setFileType: fileType];
+      [self setFileName: fileName];
+      
+      if (![self readFromFile: fileName ofType: fileType])
 	{
 	  NSRunAlertPanel (_(@"Load failed"),
 			   _(@"Could not load file %@."),