diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index 44335395e..bcdd51d33 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -950,7 +950,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
     }
 
     fatal_error "Missing source zone" if $sourcezone eq '-';
-    fatal_error "Unknown source zone ($sourcezone)"    unless $zones{$sourcezone};
+    fatal_error "Unknown source zone ($sourcezone)" unless $zones{$sourcezone};
     fatal_error "Missing destination zone" if $destzone eq '-';
     fatal_error "Unknown destination zone ($destzone)" unless $zones{$destzone};
 
diff --git a/Shorewall-perl/Shorewall/Tunnels.pm b/Shorewall-perl/Shorewall/Tunnels.pm
index de151f1b2..6ec26303f 100644
--- a/Shorewall-perl/Shorewall/Tunnels.pm
+++ b/Shorewall-perl/Shorewall/Tunnels.pm
@@ -127,7 +127,7 @@ sub setup_tunnels() {
 
 	( $kind, my ( $proto, $p ) ) = split /:/, $kind;
 
-	if ( $p ) {
+	if ( defined $p && $p ne '' ) {
 	    $port = $p;
 	    $protocol = $proto;
 	} elsif ( $proto ) {
@@ -150,7 +150,7 @@ sub setup_tunnels() {
 
 	( $kind, my ( $proto, $p ) ) = split /:/, $kind;
 
-	if ( $p ) {
+	if ( defined $p && $p ne '' ) {
 	    $port = $p;
 	    $protocol = $proto;
 	} elsif ( $proto ) {
@@ -173,7 +173,7 @@ sub setup_tunnels() {
 
 	( $kind, my ( $proto, $p ) ) = split /:/, $kind;
 
-	if ( $p ) {
+	if ( defined $p && $p ne '' ) {
 	    $port = $p;
 	    $protocol = $proto;
 	} elsif ( $proto ) {