diff --git a/ChangeLog b/ChangeLog
index 760908497..a5e682182 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-18 17:06  Alexander Malmberg  <alexander@malmberg.org>
+
+	* Source/NSWindow.m
+	(-initWithContentRect:styleMask:backing:defer:screen:): Assert that
+	the shared application instance has been created instead of just
+	calling NSLog. Make the message clearer.
+
 2005-01-18 16:53  Alexander Malmberg  <alexander@malmberg.org>
 
 	* Source/NSCell.m (-setUpFieldEditorAttributes:): Clear the
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index b1f068f4e..a75957ab5 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -912,8 +912,9 @@ many times.
 {
   NSRect  cframe;
 
-  if (!NSApp)
-    NSLog(@"No application!\n");
+  NSAssert(NSApp,
+    @"The shared NSApplication instance must be created before windows "
+    @"can be created.");
 
   NSDebugLLog(@"NSWindow", @"NSWindow start of init\n");
   if (!windowmaps)
@@ -3109,7 +3110,7 @@ resetCursorRectsForView(NSView *theView)
 	break;
 
       case NSScrollWheel:
-  	v = [_wv hitTest: [theEvent locationInWindow]];
+	v = [_wv hitTest: [theEvent locationInWindow]];
 	[v scrollWheel: theEvent];
 	break;