1 files changed, 4 insertions, 5 deletions

diff --git a/lib/basic_op.cc b/lib/basic_op.cc
index 9e2ea5a..7a2dbd2 100644
--- a/lib/basic_op.cc
+++ b/lib/basic_op.cc
@@ -141,16 +141,13 @@ namespace opkele {
             mode = mode_checkid_immediate;
         else
             throw bad_input(OPKELE_CP_ "Invalid checkid_* mode");
         try {
             assoc = retrieve_assoc(invalidate_handle=inm.get_field("assoc_handle"));
             invalidate_handle.clear();
-        }catch(failed_lookup&) {
-            // no handle specified or no valid assoc found, go dumb
-            assoc = alloc_assoc("HMAC-SHA256",SHA256_DIGEST_LENGTH,true);
-        }
+        }catch(failed_lookup&) { }
         try {
             openid2 = (inm.get_field("ns")==OIURI_OPENID20);
         }catch(failed_lookup&) { openid2 = false; }
         try {
             return_to = inm.get_field("return_to");
         }catch(failed_lookup&) { }
@@ -195,15 +192,17 @@ namespace opkele {
         verify_return_to();
         if(ext) ext->op_checkid_hook(inm);
     }
 
     basic_openid_message& basic_op::id_res(basic_openid_message& om,
             extension_t *ext) {
-        assert(assoc);
         assert(!return_to.empty());
         assert(!is_id_select());
+        if(!assoc) {
+            assoc = alloc_assoc("HMAC-SHA256",SHA256_DIGEST_LENGTH,true);
+        }
         time_t now = time(0);
         struct tm gmt; gmtime_r(&now,&gmt);
         char w3timestr[24];
         if(!strftime(w3timestr,sizeof(w3timestr),"%Y-%m-%dT%H:%M:%SZ",&gmt))
             throw failed_conversion(OPKELE_CP_
                     "Failed to build time string for nonce" );