diff --git a/config_gram.y b/config_gram.y
index d0a1de9a..5c1a8bbe 100644
--- a/config_gram.y
+++ b/config_gram.y
@@ -152,6 +152,7 @@ part_def :
                     "%s: error at %s:%d: can't determine the number of bank address bits\n"
                     "     Are you sure num_banks (=%u) is correct?\n",
                     progname, infile, lineno, current_part->mem[i].num_banks);
+            exit(1);
           }
           current_part->mem[i].bankaddrbits = pagebits;
         }
diff --git a/main.c b/main.c
index 7a9e431d..7880ece3 100644
--- a/main.c
+++ b/main.c
@@ -379,7 +379,7 @@ void verify_pin_assigned(int pin, char * desc)
 PROGRAMMER * locate_pinconfig(LISTID programmers, char * configid)
 {
   LNODEID ln1, ln2;
-  PROGRAMMER * p;
+  PROGRAMMER * p = NULL;
   char * id;
   int found;
 
@@ -404,7 +404,7 @@ PROGRAMMER * locate_pinconfig(LISTID programmers, char * configid)
 AVRPART * locate_part(LISTID parts, char * partdesc)
 {
   LNODEID ln1;
-  AVRPART * p;
+  AVRPART * p = NULL;
   int found;
 
   found = 0;