diff --git a/src/Nancy/Cryptography/AesEncryptionProvider.cs b/src/Nancy/Cryptography/AesEncryptionProvider.cs
index 3f298876a2..e380c556ed 100644
--- a/src/Nancy/Cryptography/AesEncryptionProvider.cs
+++ b/src/Nancy/Cryptography/AesEncryptionProvider.cs
@@ -72,7 +72,7 @@ public string Decrypt(string data)
                 {
                     return String.Empty;
                 }
-                throw ex;
+                throw;
             }
         }
     }
diff --git a/src/Nancy/Cryptography/DefaultHmacProvider.cs b/src/Nancy/Cryptography/DefaultHmacProvider.cs
index 7f2dd116b1..d945e8aa42 100644
--- a/src/Nancy/Cryptography/DefaultHmacProvider.cs
+++ b/src/Nancy/Cryptography/DefaultHmacProvider.cs
@@ -57,9 +57,10 @@ public byte[] GenerateHmac(string data)
         /// <returns>Hmac bytes</returns>
         public byte[] GenerateHmac(byte[] data)
         {
-            var hmacGenerator = new HMACSHA256(this.key);
-
-            return hmacGenerator.ComputeHash(data);
+            using (var hmacGenerator = new HMACSHA256(this.key))
+            {
+                return hmacGenerator.ComputeHash(data);
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Nancy/Owin/NancyMiddleware.cs b/src/Nancy/Owin/NancyMiddleware.cs
index 34a299cb71..d4ff381fce 100644
--- a/src/Nancy/Owin/NancyMiddleware.cs
+++ b/src/Nancy/Owin/NancyMiddleware.cs
@@ -73,8 +73,7 @@ public static MidFunc UseNancy(NancyOptions options = null)
                         X509Certificate2 certificate = null;
                         if (options.EnableClientCertificates)
                         {
-                            var clientCertificate = new X509Certificate2(Get<X509Certificate>(environment, "ssl.ClientCertificate").Export(X509ContentType.Cert));
-                            certificate = clientCertificate ?? null;
+                            certificate = new X509Certificate2(Get<X509Certificate>(environment, "ssl.ClientCertificate").Export(X509ContentType.Cert));
                         }
 
                         var serverClientIp = Get<string>(environment, "server.RemoteIpAddress");