@@ -160,7 +160,9 @@ public override void Dispose(bool disposing) {
                 if (item is IDisposable) {
                     (item as IDisposable).Dispose();
                 }
+                item.Client = null;
             }
+            mappings.Clear();
         }
 
         void ProcessMessagesForSubscription(AzureBusReceiverState data) {
 
@@ -91,6 +91,7 @@ protected void EnsureTopic(string topicName) {
 
         public void Dispose() {
             Dispose(true);
+            factory.Close();
         }
 
         public abstract void Dispose(bool disposing);
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,9 @@ public override void Dispose(bool disposing) {`
`160`	`160`	`if (item is IDisposable) {`
`161`	`161`	`(item as IDisposable).Dispose();`
`162`	`162`	`}`
	`163`	`+ item.Client = null;`
`163`	`164`	`}`
	`165`	`+ mappings.Clear();`
`164`	`166`	`}`
`165`	`167`
`166`	`168`	`void ProcessMessagesForSubscription(AzureBusReceiverState data) {`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ protected void EnsureTopic(string topicName) {`
`91`	`91`
`92`	`92`	`public void Dispose() {`
`93`	`93`	`Dispose(true);`
	`94`	`+ factory.Close();`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`public abstract void Dispose(bool disposing);`