diff --git a/src/spicelib/analysis/cktfndm.c b/src/spicelib/analysis/cktfndm.c
index 05bf1b415..014ece655 100644
--- a/src/spicelib/analysis/cktfndm.c
+++ b/src/spicelib/analysis/cktfndm.c
@@ -16,5 +16,5 @@ Author: 1985 Thomas L. Quarles
 GENmodel *
 CKTfndMod(CKTcircuit *ckt, IFuid modname)
 {
-    return nghash_find(ckt->MODnameHash, modname);
+    return ckt ? nghash_find(ckt->MODnameHash, modname) : NULL;
 }
diff --git a/src/spicelib/devices/cktfinddev.c b/src/spicelib/devices/cktfinddev.c
index 818b5607b..b5115b283 100644
--- a/src/spicelib/devices/cktfinddev.c
+++ b/src/spicelib/devices/cktfinddev.c
@@ -13,5 +13,5 @@ Author: 1985 Thomas L. Quarles
 GENinstance *
 CKTfndDev(CKTcircuit *ckt, IFuid name)
 {
-    return nghash_find(ckt->DEVnameHash, name);
+    return ckt ? nghash_find(ckt->DEVnameHash, name) : NULL;
 }