diff --git a/doc/faq.but b/doc/faq.but
index f3642fd5..9a8deea2 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1152,6 +1152,22 @@ running, but it doesn't stop the process's memory as a whole from
 being swapped completely out to disk when the process is long-term
 inactive. And Pageant spends most of its time inactive.
 
+\S{faq-windowsstore}{Question} Is the version of PuTTY in the
+\i{Microsoft Store} legit?
+
+The free-of-charge \q{PuTTY} application at
+\W{https://apps.microsoft.com/store/detail/putty/XPFNZKSKLBP7RJ}{this link}
+is published and maintained by us. The copy there is the latest
+release, usually updated within a few days of us publishing it on our
+own website.
+
+There have been other copies of PuTTY on the store, some looking quite
+similar, and some charging money. Those were uploaded by other people,
+and we can't guarantee anything about them.
+
+The first version we published to the Microsoft Store was 0.76 (some
+time after its initial release on our website).
+
 \H{faq-admin} Administrative questions
 
 \S{faq-putty-org}{Question} Is \cw{putty.org} your website?
diff --git a/doc/index.but b/doc/index.but
index cc043d5a..28303ee2 100644
--- a/doc/index.but
+++ b/doc/index.but
@@ -947,3 +947,6 @@ saved sessions from
 \IM{certificate}{certificates} SSH certificates
 \IM{certificate}{certificates} OpenSSH certificates
 \IM{certificate}{certificates} CA (certification authority)
+
+\IM{Microsoft Store} Microsoft Store
+\IM{Microsoft Store} Windows Store
diff --git a/ssh/kex2-client.c b/ssh/kex2-client.c
index 8ca8cd40..d5425237 100644
--- a/ssh/kex2-client.c
+++ b/ssh/kex2-client.c
@@ -559,10 +559,10 @@ void ssh2kex_coroutine(struct ssh2_transport_state *s, bool *aborted)
             dh_cleanup(s->dh_ctx);
             s->dh_ctx = NULL;
             mp_free(s->f); s->f = NULL;
-        }
-        if (dh_is_gex(s->kex_alg)) {
-            mp_free(s->g); s->g = NULL;
-            mp_free(s->p); s->p = NULL;
+            if (dh_is_gex(s->kex_alg)) {
+                mp_free(s->g); s->g = NULL;
+                mp_free(s->p); s->p = NULL;
+            }
         }
 #endif
     } else {