From d8085ed5947af45a1923efd83d0fcca172e22a00 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Mon, 13 Apr 2020 17:04:43 +0200
Subject: [PATCH] guard against ft_curckt->ci_ckt == NULL

---
 src/frontend/com_option.c | 2 +-
 src/frontend/inventory.c  | 2 +-
 src/frontend/options.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontend/com_option.c b/src/frontend/com_option.c
index 877c3bd9e..7ca4ce996 100644
--- a/src/frontend/com_option.c
+++ b/src/frontend/com_option.c
@@ -18,7 +18,7 @@ com_option(wordlist *wl)
 
     CKTcircuit *circuit = NULL;
 
-    if (!ft_curckt) {
+    if (!ft_curckt || !ft_curckt->ci_ckt) {
         fprintf(cp_err, "Error: no circuit loaded\n");
         return;
     }
diff --git a/src/frontend/inventory.c b/src/frontend/inventory.c
index 4c8b1d62c..e5996dd9c 100644
--- a/src/frontend/inventory.c
+++ b/src/frontend/inventory.c
@@ -30,7 +30,7 @@ com_inventory(wordlist *wl)
 
     NG_IGNORE(wl);
 
-    if (!ft_curckt) {
+    if (!ft_curckt || !ft_curckt->ci_ckt) {
         fprintf(cp_err, "There is no current circuit\n");
         return;
     }
diff --git a/src/frontend/options.c b/src/frontend/options.c
index c417a853a..6ea3a9f37 100644
--- a/src/frontend/options.c
+++ b/src/frontend/options.c
@@ -430,7 +430,7 @@ cp_usrset(struct variable *var, bool isset)
         return (0);
     }
 
-    if (ft_curckt) {
+    if (ft_curckt && ft_curckt->ci_ckt) {
         if (if_option(ft_curckt->ci_ckt, var->va_name, var->va_type, vv))
             return US_SIMVAR;
     } else {