diff --git a/ChangeLog b/ChangeLog
index 176fc0041..a7cf1f7bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* Main/SOGo.m ([SOGo
+	-_checkTableWithCM:cmtableURL:urlandType:tableType]): empty the
+	result set if the query has caused no exception. Otherwise we get
+	an "evaluation is in progress exception".
+
 2007-06-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults
diff --git a/Main/SOGo.m b/Main/SOGo.m
index b4afe3a28..efe2accf1 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -169,6 +169,8 @@ static BOOL debugObjectAllocation = NO;
 		 [NSString stringWithContentsOfFile: descFile]])
 	[self logWithFormat: @"table '%@' successfully created!", tableName];
     }
+  else
+    [tc cancelFetch];
 
   [cm releaseChannel: tc];