diff --git a/npa/src/card-npa.c b/npa/src/card-npa.c
index e1c8f8e..e95ac9a 100644
--- a/npa/src/card-npa.c
+++ b/npa/src/card-npa.c
@@ -95,7 +95,7 @@ static int npa_load_options(sc_context_t *ctx, struct npa_drv_data *drv_data)
         goto err;
     }
 
-    for (i = 0; ctx->conf_blocks && ctx->conf_blocks[i] != NULL; i++) {
+    for (i = 0; ctx->conf_blocks; i++) {
         found_blocks = scconf_find_blocks(ctx->conf, ctx->conf_blocks[i],
                     "card_driver", "npa");
         if (!found_blocks)
diff --git a/npa/src/scutil.c b/npa/src/scutil.c
index 571ba5b..ba3ff22 100644
--- a/npa/src/scutil.c
+++ b/npa/src/scutil.c
@@ -159,8 +159,7 @@ int print_avail(int verbose)
 
     r = list_readers(ctx);
 
-    if (ctx)
-        sc_release_context(ctx);
+    sc_release_context(ctx);
 
     return r;
 }