diff --git a/src/Spring/Spring.Data/Data/Common/DbParameters.cs b/src/Spring/Spring.Data/Data/Common/DbParameters.cs
index 4be458d8..53ce8e86 100644
--- a/src/Spring/Spring.Data/Data/Common/DbParameters.cs
+++ b/src/Spring/Spring.Data/Data/Common/DbParameters.cs
@@ -252,7 +252,7 @@ namespace Spring.Data.Common
             {
                 return parameter.Value;
             }
-            throw new UncategorizedAdoException(
+            throw new InvalidDataAccessApiUsageException(
                 "object in IDataParameterCollection is not of the type IDataParameter, it is type [" +
                 dataParameterCollection[dbProvider.CreateParameterNameForCollection(name)].GetType() + "].");
         }
diff --git a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
index 7221d873..ae47e2c4 100644
--- a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
+++ b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
@@ -277,7 +277,7 @@ namespace Spring.Data
                 return defaultDbProvider;
             }
             throw new InvalidDataAccessApiUsageException("'" + dbProviderName + "'"
-                                        + "was not under the thread local key 'dbProviderName'");
+                                        + "was not under the thread local key 'dbProviderName' and no default IDbProvider was set.");
         }
 
         /// <summary>
diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs
index 8131184f..7280e2b0 100644
--- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs
+++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs
@@ -23,7 +23,6 @@ using System.Collections;
 using System.Messaging;
 using Common.Logging;
 using Spring.Context;
-using Spring.Messaging.Support;
 using Spring.Messaging.Support.Converters;
 using Spring.Objects.Factory;
 using Spring.Objects.Factory.Config;
diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs b/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs
index 684a8fdc..261cc199 100644
--- a/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs
+++ b/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs
@@ -24,7 +24,6 @@ using Common.Logging;
 using Spring.Context;
 using Spring.Expressions;
 using Spring.Messaging.Core;
-using Spring.Messaging.Support;
 using Spring.Messaging.Support.Converters;
 using Spring.Objects.Factory;
 using Spring.Reflection.Dynamic;
diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs
index af443c36..6f551ce6 100644
--- a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs
+++ b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs
@@ -23,7 +23,6 @@ using System.Messaging;
 using Common.Logging;
 using Spring.Data.Core;
 using Spring.Messaging.Core;
-using Spring.Messaging.Support;
 using Spring.Transaction;
 using Spring.Transaction.Support;
 
diff --git a/src/Spring/Spring.Messaging/Messaging/Support/QueueUtils.cs b/src/Spring/Spring.Messaging/Messaging/Support/QueueUtils.cs
index 0b7470aa..c85e9ebe 100644
--- a/src/Spring/Spring.Messaging/Messaging/Support/QueueUtils.cs
+++ b/src/Spring/Spring.Messaging/Messaging/Support/QueueUtils.cs
@@ -22,12 +22,11 @@ using System;
 using System.Collections;
 using System.Messaging;
 using Spring.Context;
-using Spring.Messaging.Core;
 using Spring.Messaging.Support.Converters;
 using Spring.Objects.Factory.Support;
 using Spring.Transaction.Support;
 
-namespace Spring.Messaging.Support
+namespace Spring.Messaging.Core
 {
     /// <summary>
     /// Utility methods to support Spring's MSMQ functionality
@@ -116,12 +115,11 @@ namespace Spring.Messaging.Support
 
         public void BeforeCommit(bool readOnly)
         {
-            throw new NotImplementedException();
+            
         }
 
         public void AfterCommit()
         {
-            throw new NotImplementedException();
         }
 
         public void BeforeCompletion()
@@ -129,12 +127,12 @@ namespace Spring.Messaging.Support
             TransactionSynchronizationManager.UnbindResource(resourceKey);
             holderActive = false;
             //this.resourceHolder.closeAll();
-            throw new NotImplementedException();
+            //TODO SPRNET-1244
         }
 
         public void AfterCompletion(TransactionSynchronizationStatus status)
         {
-            throw new NotImplementedException();
+            //TODO SPRNET-1244
         }
 
         #endregion