diff --git a/src/dsa_keygen.c b/src/dsa_keygen.c
index 316b2327f3e223b9a2e9893be616ca7e179ee3c6..0c8b7b00afb0586e6c5c029e64df11e7e5981b27 100644
--- a/src/dsa_keygen.c
+++ b/src/dsa_keygen.c
@@ -191,13 +191,13 @@ dsa_generate_key(struct randomness *r, unsigned level)
 {
   struct sexp *key = NULL;
 
-  assert(r->quality == RANDOM_GOOD);
-  
   mpz_t p; mpz_t q;
   mpz_t g; mpz_t y;
   mpz_t x;
   mpz_t t;
 
+  assert(r->quality == RANDOM_GOOD);
+  
   mpz_init(p); mpz_init(q);
   mpz_init(g); mpz_init(y);
   mpz_init(x);
diff --git a/src/rsa_keygen.c b/src/rsa_keygen.c
index 1d99b1b35745fdee8b85f819fc7713b0495123b4..da0bcf3d746019fb2f6df724a61c54834785eba2 100644
--- a/src/rsa_keygen.c
+++ b/src/rsa_keygen.c
@@ -40,8 +40,6 @@ rsa_generate_key(mpz_t e, struct randomness *r, UINT32 bits)
 {
   struct sexp *key = NULL;
 
-  assert(r->quality == RANDOM_GOOD);
-  
   mpz_t n;
   mpz_t d;
   mpz_t p; mpz_t q;
@@ -49,6 +47,8 @@ rsa_generate_key(mpz_t e, struct randomness *r, UINT32 bits)
   mpz_t phi;
   mpz_t tmp;
   
+  assert(r->quality == RANDOM_GOOD);
+  
   mpz_init(n); mpz_init(d); mpz_init(p), mpz_init(q);
   mpz_init(a); mpz_init(b); mpz_init(c);