diff --git a/ChangeLog b/ChangeLog
index 3fcf0389b..3adafb069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-17 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSTableView.m (-setDataSource:): Make the data source
+	method tableView:objectValueForTableColumn:row: optional.
+	* Source/externs.m: Define some arbitray values for KVB markers.
+
 2007-12-15 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSControl.m (-bind:...options:): Correct value binding.
diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index 8f0d6098f..5e619c413 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -2273,12 +2273,13 @@ static void computeNewSelection
   
   if (anObject && [anObject respondsToSelector: sel_b] == NO) 
     {
+/* This method isn't required.
       [NSException raise: NSInternalInconsistencyException 
 		   format: @"Data Source doesn't respond to "
 		   @"tableView:objectValueForTableColumn:row:"];
+*/  
     }
   
-  
   _dataSource_editable = [anObject respondsToSelector: sel_c];
 
   /* We do *not* retain the dataSource, it's like a delegate */
diff --git a/Source/externs.m b/Source/externs.m
index 44c3fa1f4..c43a3d6b8 100644
--- a/Source/externs.m
+++ b/Source/externs.m
@@ -632,9 +632,9 @@ NSString *NSToolTipBinding = @"toolTip";
 NSString *NSValueBinding = @"value";
 
 // FIXME: Need to defined!
-id NSMultipleValuesMarker = nil;
-id NSNoSelectionMarker = nil;
-id NSNotApplicableMarker = nil;
+id NSMultipleValuesMarker = @"NSMultipleValuesMarker";
+id NSNoSelectionMarker = @"NSNoSelectionMarker";
+id NSNotApplicableMarker = @"NSNotApplicableMarker";
 
 
 extern void __objc_gui_force_linking (void);