diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index ae8040378..4a206b138 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -299,6 +299,7 @@ handle_mhd_completion_callback (void *cls,
   struct ExchangeHttpRequestClosure *ecls = *con_cls;
   struct GNUNET_AsyncScopeSave old_scope;
 
+  (void) cls;
   if (NULL == ecls)
     return;
   GNUNET_async_scope_enter (&ecls->async_scope_id,
@@ -325,7 +326,6 @@ handle_mhd_completion_callback (void *cls,
                 toe);
 #endif
   }
-  (void) cls;
 
   TALER_MHD_parse_post_cleanup_callback (ecls->opaque_post_parsing_context);
   /* Sanity-check that we didn't leave any transactions hanging */
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 4af28b141..0cc8c831c 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020, 2021 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free Software
@@ -1715,6 +1715,7 @@ build_key_state (struct HelperState *hs,
   ksh->signkey_map = GNUNET_CONTAINER_multipeermap_create (32,
                                                            GNUNET_NO /* MUST be NO! */);
   ksh->auditors = json_array ();
+  GNUNET_assert (NULL != ksh->auditors);
   /* NOTE: fetches master-signed signkeys, but ALSO those that were revoked! */
   qs = TEH_plugin->iterate_denominations (TEH_plugin->cls,
                                           &denomination_info_cb,