Index: System.Data.SQLite/SQLiteKeyReader.cs
==================================================================
--- System.Data.SQLite/SQLiteKeyReader.cs
+++ System.Data.SQLite/SQLiteKeyReader.cs
@@ -40,58 +40,108 @@
       internal int column;
     }
 
     /// <summary>
     /// A single sub-query for a given table/database.
-    /// </summary>
-    private sealed class KeyQuery : IDisposable
-    {
-      private SQLiteCommand _command;
-      internal SQLiteDataReader _reader;
-
-      internal KeyQuery(SQLiteConnection cnn, string database, string table, params string[] columns)
-      {
-        using (SQLiteCommandBuilder builder = new SQLiteCommandBuilder())
-        {
-          _command = cnn.CreateCommand();
-          for (int n = 0; n < columns.Length; n++)
-          {
-            columns[n] = builder.QuoteIdentifier(columns[n]);
-          }
-        }
-        _command.CommandText = String.Format(CultureInfo.InvariantCulture, "SELECT {0} FROM [{1}].[{2}] WHERE ROWID = ?", String.Join(",", columns), database, table);
-        _command.Parameters.AddWithValue(null, (long)0);
-      }
-
-      internal bool IsValid
-      {
-        set
-        {
-          if (value != false) throw new ArgumentException();
-          if (_reader != null)
-          {
-            _reader.Dispose();
-            _reader = null;
-          }
-        }
-      }
-
-      internal void Sync(long rowid)
-      {
-        IsValid = false;
-        _command.Parameters[0].Value = rowid;
-        _reader = _command.ExecuteReader();
-        _reader.Read();
-      }
-
-      public void Dispose()
-      {
-        IsValid = false;
-
-        if (_command != null) _command.Dispose();
-        _command = null;
-      }
+    /// </summary>
+    private sealed class KeyQuery : IDisposable
+    {
+        private SQLiteCommand _command;
+        internal SQLiteDataReader _reader;
+
+        internal KeyQuery(SQLiteConnection cnn, string database, string table, params string[] columns)
+        {
+            using (SQLiteCommandBuilder builder = new SQLiteCommandBuilder())
+            {
+                _command = cnn.CreateCommand();
+                for (int n = 0; n < columns.Length; n++)
+                {
+                    columns[n] = builder.QuoteIdentifier(columns[n]);
+                }
+            }
+            _command.CommandText = String.Format(CultureInfo.InvariantCulture, "SELECT {0} FROM [{1}].[{2}] WHERE ROWID = ?", String.Join(",", columns), database, table);
+            _command.Parameters.AddWithValue(null, (long)0);
+        }
+
+        internal bool IsValid
+        {
+            set
+            {
+                if (value != false) throw new ArgumentException();
+                if (_reader != null)
+                {
+                    _reader.Dispose();
+                    _reader = null;
+                }
+            }
+        }
+
+        internal void Sync(long rowid)
+        {
+            IsValid = false;
+            _command.Parameters[0].Value = rowid;
+            _reader = _command.ExecuteReader();
+            _reader.Read();
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        #region IDisposable Members
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+        #endregion
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        #region IDisposable "Pattern" Members
+        private bool disposed;
+        private void CheckDisposed() /* throw */
+        {
+#if THROW_ON_DISPOSED
+            if (disposed)
+                throw new ObjectDisposedException(typeof(KeyQuery).Name);
+#endif
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        private void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    ////////////////////////////////////
+                    // dispose managed resources here...
+                    ////////////////////////////////////
+
+                    IsValid = false;
+
+                    if (_command != null) _command.Dispose();
+                    _command = null;
+                }
+
+                //////////////////////////////////////
+                // release unmanaged resources here...
+                //////////////////////////////////////
+
+                disposed = true;
+            }
+        }
+        #endregion
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        #region Destructor
+        ~KeyQuery()
+        {
+            Dispose(false);
+        }
+        #endregion
     }
 
     /// <summary>
     /// This function does all the nasty work at determining what keys need to be returned for
     /// a given statement.
@@ -257,10 +307,77 @@
       // CommandBehavior.KeyInfo
       _keyInfo = new KeyInfo[keys.Count];
       keys.CopyTo(_keyInfo);
     }
 
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region IDisposable Members
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region IDisposable "Pattern" Members
+    private bool disposed;
+    private void CheckDisposed() /* throw */
+    {
+#if THROW_ON_DISPOSED
+        if (disposed)
+            throw new ObjectDisposedException(typeof(SQLiteKeyReader).Name);
+#endif
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    private void Dispose(bool disposing)
+    {
+        if (!disposed)
+        {
+            if (disposing)
+            {
+                ////////////////////////////////////
+                // dispose managed resources here...
+                ////////////////////////////////////
+
+                _stmt = null;
+
+                if (_keyInfo == null) return;
+
+                for (int n = 0; n < _keyInfo.Length; n++)
+                {
+                    if (_keyInfo[n].query != null)
+                        _keyInfo[n].query.Dispose();
+                }
+
+                _keyInfo = null;
+            }
+
+            //////////////////////////////////////
+            // release unmanaged resources here...
+            //////////////////////////////////////
+
+            disposed = true;
+        }
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region Destructor
+    ~SQLiteKeyReader()
+    {
+        Dispose(false);
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
     /// <summary>
     /// How many additional columns of keyinfo we're holding
     /// </summary>
     internal int Count
     {
@@ -312,24 +429,10 @@
         if (_keyInfo[n].query != null)
           _keyInfo[n].query.IsValid = false;
       }
     }
 
-    public void Dispose()
-    {
-      _stmt = null;
-
-      if (_keyInfo == null) return;
-
-      for (int n = 0; n < _keyInfo.Length; n++)
-      {
-        if (_keyInfo[n].query != null)
-          _keyInfo[n].query.Dispose();
-      }
-      _keyInfo = null;
-    }
-
     internal string GetDataTypeName(int i)
     {
       Sync();
       if (_keyInfo[i].query != null) return _keyInfo[i].query._reader.GetDataTypeName(_keyInfo[i].column);
       else return "integer";

Index: System.Data.SQLite/SQLiteStatement.cs
==================================================================
--- System.Data.SQLite/SQLiteStatement.cs
+++ System.Data.SQLite/SQLiteStatement.cs
@@ -86,10 +86,79 @@
           _paramValues[x] = null;
         }
       }
     }
 
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region IDisposable Members
+    /// <summary>
+    /// Disposes and finalizes the statement
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region IDisposable "Pattern" Members
+    private bool disposed;
+    private void CheckDisposed() /* throw */
+    {
+#if THROW_ON_DISPOSED
+        if (disposed)
+            throw new ObjectDisposedException(typeof(SQLiteStatement).Name);
+#endif
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!disposed)
+        {
+            if (disposing)
+            {
+                ////////////////////////////////////
+                // dispose managed resources here...
+                ////////////////////////////////////
+
+                if (_sqlite_stmt != null)
+                {
+                    _sqlite_stmt.Dispose();
+                    _sqlite_stmt = null;
+                }
+
+                _paramNames = null;
+                _paramValues = null;
+                _sql = null;
+                _sqlStatement = null;
+            }
+
+            //////////////////////////////////////
+            // release unmanaged resources here...
+            //////////////////////////////////////
+
+            disposed = true;
+        }
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region Destructor
+    ~SQLiteStatement()
+    {
+        Dispose(false);
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
     /// <summary>
     /// Called by SQLiteParameterCollection, this function determines if the specified parameter name belongs to
     /// this statement, and if so, keeps a reference to the parameter so it can be bound later.
     /// </summary>
     /// <param name="s">The parameter name to map</param>
@@ -115,29 +184,10 @@
         }
       }
       return false;
     }
 
-    #region IDisposable Members
-    /// <summary>
-    /// Disposes and finalizes the statement
-    /// </summary>
-    public void Dispose()
-    {
-      if (_sqlite_stmt != null)
-      {
-        _sqlite_stmt.Dispose();
-      }
-      _sqlite_stmt = null;
-      
-      _paramNames = null;
-      _paramValues = null;
-      _sql = null;
-      _sqlStatement = null;
-    }
-    #endregion
-    
     /// <summary>
     ///  Bind all parameters, making sure the caller didn't miss any
     /// </summary>
     internal void BindParameters()
     {

Index: System.Data.SQLite/SQLiteTransaction.cs
==================================================================
--- System.Data.SQLite/SQLiteTransaction.cs
+++ System.Data.SQLite/SQLiteTransaction.cs
@@ -55,17 +55,69 @@
           _cnn._transactionLevel--;
           _cnn = null;
           throw;
         }
       }
-    }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region IDisposable "Pattern" Members
+    private bool disposed;
+    private void CheckDisposed() /* throw */
+    {
+#if THROW_ON_DISPOSED
+        if (disposed)
+            throw new ObjectDisposedException(typeof(SQLiteTransaction).Name);
+#endif
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    /// <summary>
+    /// Disposes the transaction.  If it is currently active, any changes are rolled back.
+    /// </summary>
+    protected override void Dispose(bool disposing)
+    {
+        try
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    ////////////////////////////////////
+                    // dispose managed resources here...
+                    ////////////////////////////////////
+
+                    if (IsValid(false))
+                    {
+                        IssueRollback();
+                    }
+                }
+
+                //////////////////////////////////////
+                // release unmanaged resources here...
+                //////////////////////////////////////
+
+                disposed = true;
+            }
+        }
+        finally
+        {
+            base.Dispose(disposing);
+        }
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
 
     /// <summary>
     /// Commits the current transaction.
     /// </summary>
     public override void Commit()
-    {
+    {
+      CheckDisposed();
       IsValid(true);
 
       if (_cnn._transactionLevel - 1 == 0)
       {
         using (SQLiteCommand cmd = _cnn.CreateCommand())
@@ -80,50 +132,36 @@
 
     /// <summary>
     /// Returns the underlying connection to which this transaction applies.
     /// </summary>
     public new SQLiteConnection Connection
-    {
-      get { return _cnn; }
+    {
+      get { CheckDisposed(); return _cnn; }
     }
 
     /// <summary>
     /// Forwards to the local Connection property
     /// </summary>
     protected override DbConnection DbConnection
-    {
+    {
       get { return Connection; }
     }
 
-    /// <summary>
-    /// Disposes the transaction.  If it is currently active, any changes are rolled back.
-    /// </summary>
-    protected override void Dispose(bool disposing)
-    {
-      if (disposing)
-      {
-        if (IsValid(false))
-        {
-          IssueRollback();
-        }
-      }
-      base.Dispose(disposing);
-    }
-
     /// <summary>
     /// Gets the isolation level of the transaction.  SQLite only supports Serializable transactions.
     /// </summary>
     public override IsolationLevel IsolationLevel
-    {
-      get { return _level; }
+    {
+      get { CheckDisposed(); return _level; }
     }
 
     /// <summary>
     /// Rolls back the active transaction.
     /// </summary>
     public override void Rollback()
-    {
+    {
+      CheckDisposed();
       IsValid(true);
       IssueRollback();
     }
 
     internal void IssueRollback()

Index: System.Data.SQLite/SR.Designer.cs
==================================================================
--- System.Data.SQLite/SR.Designer.cs
+++ System.Data.SQLite/SR.Designer.cs
@@ -1,5 +1,12 @@
+/********************************************************
+ * ADO.NET 2.0 Data Provider for SQLite Version 3.X
+ * Written by Robert Simpson (robert@blackcastlesoft.com)
+ * 
+ * Released to the public domain, use at your own risk!
+ ********************************************************/
+
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.1
 //