diff --git a/ChangeLog b/ChangeLog
index 4f8040d7c..bd4606761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-01  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSApplication.m (-finishLaunching): Do not attempt to
+	open an	untitled document in a document based application that
+	does not define an editor type.
+
 2010-06-01  Quentin Mathe <quentin.mathe@gmail.com>
 
 	Fixed many drawing issues (many ones being related to the flipping).
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 482a777a1..0359e72a3 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -1145,7 +1145,7 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
               [_delegate applicationOpenUntitledFile: self];
             }
         }
-      else if ([[sdc documentClassNames] count] > 0)
+      else if ([[sdc documentClassNames] count] > 0 && [sdc defaultType] != nil)
         {
 	  NSError *err = nil;