diff --git a/src/Marr.Data/DataMapper.cs b/src/Marr.Data/DataMapper.cs
index 51423b9880..c632471cf6 100644
--- a/src/Marr.Data/DataMapper.cs
+++ b/src/Marr.Data/DataMapper.cs
@@ -941,21 +941,21 @@ protected virtual void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (Command.Transaction != null)
+                if (_command != null)
                 {
-                    Command.Transaction.Dispose();
-                    Command.Transaction = null;
-                }
+                    if (_command.Transaction != null)
+                    {
+                        _command.Transaction.Dispose();
+                        _command.Transaction = null;
+                    }
 
-                if (Command.Connection != null)
-                {
-                    Command.Connection.Dispose();
-                    Command.Connection = null;
-                }
+                    if (_command.Connection != null)
+                    {
+                        _command.Connection.Dispose();
+                        _command.Connection = null;
+                    }
 
-                if (Command != null)
-                {
-                    Command.Dispose();
+                    _command.Dispose();
                     _command = null;
                 }
             }