diff --git a/CASA.changes b/CASA.changes
index ac4a02da..0b10255a 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,7 @@
+-------------------------------------------------------------------
+Tue Feb 22 14:03:20 MST 2006 - jnorman@novell.com
+- Bug 151679. Remove reverse links when deleting a secret - fixed
+
 -------------------------------------------------------------------
 Tue Feb 22 13:33:20 MST 2006 - jnorman@novell.com
 - Bug 150642. Return additional error codes when store is locked
diff --git a/c_micasad/cache/KeyChain.cs b/c_micasad/cache/KeyChain.cs
index c253d923..0d2782bf 100644
--- a/c_micasad/cache/KeyChain.cs
+++ b/c_micasad/cache/KeyChain.cs
@@ -118,9 +118,9 @@ class KeyChain : IKeychain
 			Secret secret = GetSecret(secretID);
 			secret.RemoveAllKeyValuePairs(this);
 		}
-		catch
-		{
-
+		catch (Exception e)
+		{
+            CSSSLogger.ExpLog(e.ToString());
 		}
 
         SecretList.Remove(secretID);
diff --git a/c_micasad/cache/Secret.cs b/c_micasad/cache/Secret.cs
index 42a8a957..5ee91733 100644
--- a/c_micasad/cache/Secret.cs
+++ b/c_micasad/cache/Secret.cs
@@ -243,12 +243,14 @@ namespace sscs.cache
 		internal void RemoveAllKeyValuePairs(KeyChain kc)
 		{
 			if (htKeyValues != null)
-			{	
-				IDictionaryEnumerator enumer = htKeyValues.GetEnumerator();
+			{
+                IDictionaryEnumerator enumer = htKeyValues.GetEnumerator();
 				while (enumer.MoveNext())
 				{
 					String key = (String)enumer.Key;
 					RemoveKeyValue(kc, key);
+                    // refresh enumerator
+                    enumer = htKeyValues.GetEnumerator();
 				}
 			}
 		}