diff --git a/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs b/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs
index 1cdd27614fe..a5b97a6c21a 100644
--- a/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs
+++ b/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs
@@ -468,7 +468,11 @@ private void InitConnectionAndExecute(Action<string> scriptAction, bool execute,
 			{
 				if (connectionProvider != null)
 				{
-					connectionProvider.CloseConnection(connection);
+					if (connection != null)
+					{
+						connectionProvider.CloseConnection(connection);
+					}
+
 					connectionProvider.Dispose();
 				}
 			}