diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs
index 1b27647b81..1cccae4d10 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs
@@ -115,22 +115,17 @@ namespace ICSharpCode.Data.Core.UI.Windows
 		{
 			Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { IsLoading = value; }));
 		}
-
-//		private void SetException(Exception exception)
-//		{
-//			Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { DatasourceException = exception; }));
-//		}
-
+		
+		
 		private void SetException(Exception exception)
 		{
 			if (exception!= null) {
-				
-			
-			Dispatcher.BeginInvoke(DispatcherPriority.Background,
-			                       new Action(() => {MessageService.ShowError(exception.Message);}));
+				Dispatcher.BeginInvoke(DispatcherPriority.Background,
+				                       new Action(() => {MessageService.ShowError(exception.Message);}));
 			}
 		}
 		
+		
 		private void SetSelectedDatasource(IDatasource datasource)
 		{
 			Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { SelectedDatasource = datasource; }));
@@ -174,7 +169,6 @@ namespace ICSharpCode.Data.Core.UI.Windows
 
 			                                           		try
 			                                           		{
-//			                                           			SelectedDatabaseDriver.PopulateDatabases();
 			                                           			SelectedDatabaseDriver.PopulateDatabases(_selectedDatasource);
 			                                           		}
 			                                           		catch (Exception ex)
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/SQLServerDatabaseDriver.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/SQLServerDatabaseDriver.cs
index 7ccd3fb26e..37d7c4bcf4 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/SQLServerDatabaseDriver.cs
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/SQLServerDatabaseDriver.cs
@@ -30,7 +30,7 @@ namespace ICSharpCode.Data.Core.DatabaseDrivers.SQLServer
         private const string _getTables = @"SELECT TABLE_SCHEMA, TABLE_NAME from INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE='BASE TABLE' AND TABLE_NAME<>'dtproperties' ORDER BY TABLE_SCHEMA, TABLE_NAME";
 
         //http://community.sharpdevelop.net/forums/p/12955/37213.aspx#37213
-        //clmns.is_column_set AS [IsColumnSet], 
+        //remove this line clmns.is_column_set AS [IsColumnSet], 
         
         private const string _getColumnsScript = @"DECLARE @tablename varchar(100) SET @tablename = N'{0}'
             SELECT