diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index 660afea3a..8abb9c7da 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -488,6 +488,8 @@ my  %builtin_target = ( ACCEPT      => 1,
 			ULOG        => 1,
 		        );
 
+my %ipset_exists;
+
 #
 # Rules are stored in an internal form
 #
@@ -617,6 +619,8 @@ sub initialize( $$$ ) {
     $hashlimitset       = 0;
     $ipset_rules        = 0 if $hard;
 
+    %ipset_exists       = ();   
+
     %helpers = ( amanda          => TCP,
 		 ftp             => TCP,
 		 h323            => UDP,
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index acb1940af..4c1a59b6d 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -1564,7 +1564,7 @@ sub process_conditional( $$ ) {
     } else {
 	fatal_error "Invalid ?ENDIF" unless $rest eq '';
 	fatal_error q(Unexpected "?ENDIF" without matching ?IF or ?ELSE) if @ifstack <= $ifstack;
-	$omitting = $lastomitting;
+	$omitting = $lastomit;
 	@{pop @ifstack};
     }