diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 8f96eee84..f55771b7b 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -1115,6 +1115,8 @@ struct card *inp_readall(FILE *fp, const char *dir_name,
         if (inp_poly_2g6_compat(working)) {
             inp_rem_levels(root);
             line_free_x(cc, TRUE);
+            if (ft_stricterror)
+                controlled_exit(EXIT_BAD);
             return NULL;
         }
 #else
@@ -1393,6 +1395,8 @@ struct inp_read_t inp_read( FILE *fp, int call_depth, const char *dir_name,
                 if (!y_resolved) {
                     fprintf(cp_err, "Error: Could not find include file %s\n",
                             y);
+                    if (ft_stricterror)
+                        controlled_exit(EXIT_FAILURE);
                     rv.line_number = line_number;
                     rv.cc = NULL;
                     return rv;
@@ -5849,6 +5853,8 @@ static void inp_compat(struct card *card)
                                 (firstno && !secondno)) {
                             fprintf(stderr, "Error: Missing token in %s\n",
                                     curr_line);
+                            if (ft_stricterror)
+                                controlled_exit(EXIT_FAILURE);
                             break;
                         }
                         else if (!firstno && !secondno)
@@ -6060,6 +6066,8 @@ static void inp_compat(struct card *card)
                     if ((!firstno && secondno) || (firstno && !secondno)) {
                         fprintf(stderr, "Error: Missing token in %s\n",
                                 curr_line);
+                        if (ft_stricterror)
+                            controlled_exit(EXIT_BAD);
                         break;
                     }
                     else if (!firstno && !secondno)
@@ -8080,6 +8088,8 @@ static int inp_vdmos_model(struct card *deck)
                     "    in VDMOS instance line with thermal model\n"
                     "    %s\n", card->line);
                 fprintf(stderr, "No circuit loaded!\n");
+                if (ft_stricterror)
+                    controlled_exit(EXIT_BAD);
                 return 1;
             }
             /* next token is the model name of instance */
@@ -8101,6 +8111,8 @@ static int inp_vdmos_model(struct card *deck)
                 "    %s\n", card->line);
             fprintf(stderr, "No circuit loaded!\n");
             tfree(instmodname);
+            if (ft_stricterror)
+                controlled_exit(EXIT_BAD);
             return 1;
         }
     }
@@ -9134,6 +9146,8 @@ static int inp_poly_2g6_compat(struct card* deck) {
             if (!curr_line) {
                 fprintf(stderr, "Error: bad syntax of line\n   %s\n", thisline);
                 fprintf(stderr, "No circuit loaded!\n");
+                if (ft_stricterror)
+                    controlled_exit(EXIT_BAD);
                 return 1;
             }
             /* exclude all of the following fourth tokens */
@@ -9171,6 +9185,8 @@ static int inp_poly_2g6_compat(struct card* deck) {
             if (!curr_line) {
                 fprintf(stderr, "Error: not enough parameters in line\n   %s\n", thisline);
                 fprintf(stderr, "No circuit loaded!\n");
+                if (ft_stricterror)
+                    controlled_exit(EXIT_BAD);
                 return 1;
             }
             /* The next token may be a simple text token or an expression
@@ -9184,6 +9200,8 @@ static int inp_poly_2g6_compat(struct card* deck) {
             if (!curr_line) {
                 fprintf(stderr, "Error: not enough parameters in line\n   %s\n", thisline);
                 fprintf(stderr, "No circuit loaded!\n");
+                if (ft_stricterror)
+                    controlled_exit(EXIT_BAD);
                 return 1;
             }
             if (*curr_line == '\0')
@@ -9195,6 +9213,8 @@ static int inp_poly_2g6_compat(struct card* deck) {
             if (!curr_line) {
                 fprintf(stderr, "Error: not enough parameters in line\n   %s\n", thisline);
                 fprintf(stderr, "No circuit loaded!\n");
+                if (ft_stricterror)
+                    controlled_exit(EXIT_BAD);
                 return 1;
             }
             /* The next token may be a simple text token or an expression
@@ -9208,6 +9228,8 @@ static int inp_poly_2g6_compat(struct card* deck) {
             if (!curr_line) {
                 fprintf(stderr, "Error: not enough parameters in line\n   %s\n", thisline);
                 fprintf(stderr, "No circuit loaded!\n");
+                if (ft_stricterror)
+                    controlled_exit(EXIT_BAD);
                 return 1;
             }
             if (*curr_line == '\0')
diff --git a/src/main.c b/src/main.c
index 0dc5db052..6b3f2cf36 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1461,8 +1461,8 @@ int main(int argc, char **argv)
                 /* Copy the input file name for becoming another file search path */
                 if (inp_spsource(tempfile, FALSE, dname, FALSE) != 0) {
                     fprintf(stderr, "    Simulation interrupted due to error!\n\n");
-                    if (oflag && !cp_getvar("interactive", CP_BOOL, NULL, 0))
-                        exit(EXIT_BAD);
+                    if (ft_stricterror || (oflag && !cp_getvar("interactive", CP_BOOL, NULL, 0)))
+                        sp_shutdown(EXIT_BAD);
                 }
                 tfree(dname);
                 gotone = TRUE;
@@ -1477,6 +1477,8 @@ int main(int argc, char **argv)
         if (!gotone && ft_batchmode) {
             if (inp_spsource(circuit_file, FALSE, NULL, FALSE) != 0) {
                     fprintf(stderr, "    Simulation interrupted due to error!\n\n");
+                    if (ft_stricterror)
+                        sp_shutdown(EXIT_BAD);
             }
         }