Moved the VerificationException catch lower in the stack so it catches more problems.

1 files changed, 13 insertions, 11 deletions

diff --git a/src/DotNetOpenAuth/OpenId/RelyingParty/AssociationManager.cs b/src/DotNetOpenAuth/OpenId/RelyingParty/AssociationManager.cs
index 8ed63f5..9af947a 100644
--- a/src/DotNetOpenAuth/OpenId/RelyingParty/AssociationManager.cs
+++ b/src/DotNetOpenAuth/OpenId/RelyingParty/AssociationManager.cs
@@ -148,10 +148,20 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 				return null;
 			}
 
-			var associateRequest = AssociateRequest.Create(this.securitySettings, provider);
+			try {
+				var associateRequest = AssociateRequest.Create(this.securitySettings, provider);
 
-			const int RenegotiateRetries = 1;
-			return this.CreateNewAssociation(provider, associateRequest, RenegotiateRetries);
+				const int RenegotiateRetries = 1;
+				return this.CreateNewAssociation(provider, associateRequest, RenegotiateRetries);
+			} catch (VerificationException ex) {
+				// See Trac ticket #163.  In partial trust host environments, the
+				// Diffie-Hellman implementation we're using for HTTP OP endpoints
+				// sometimes causes the CLR to throw:
+				// "VerificationException: Operation could destabilize the runtime."
+				// Just give up and use dumb mode in this case.
+				Logger.OpenId.ErrorFormat("VerificationException occurred while trying to create an association with {0}.  {1}", provider.Endpoint, ex);
+				return null;
+			}
 		}
 
 		/// <summary>
@@ -222,14 +232,6 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 				// the exception so that auth may continue in dumb mode.
 				Logger.OpenId.ErrorFormat("An error occurred while trying to create an association with {0}.  {1}", provider.Endpoint, ex);
 				return null;
-			} catch (VerificationException ex) {
-				// See Trac ticket #163.  In partial trust host environments, the
-				// Diffie-Hellman implementation we're using for HTTP OP endpoints
-				// sometimes causes the CLR to throw:
-				// "VerificationException: Operation could destabilize the runtime."
-				// Just give up and use dumb mode in this case.
-				Logger.OpenId.ErrorFormat("VerificationException occurred while trying to create an association with {0}.  {1}", provider.Endpoint, ex);
-				return null;
 			}
 		}
 	}