diff --git a/Shorewall/firewall b/Shorewall/firewall
index 86940288c..16eacba08 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -444,7 +444,7 @@ validate_interfaces_file() {
 	[ "x$z" = "x-" ] || validate_zone $z || startup_error "Invalid zone ($z) in record \"$r\""
 
 	list_search $interface $all_interfaces && \
-	    startup_error "Duplicate Interface $interface"
+	    startup_error "Error: Duplicate Interface $interface"
 	
 	all_interfaces="$all_interfaces $interface"
 
@@ -991,6 +991,8 @@ stop_firewall() {
 clear_firewall() {
     stop_firewall
 
+    run_iptables -F
+
     setpolicy INPUT ACCEPT
     setpolicy FORWARD ACCEPT
     setpolicy OUTPUT ACCEPT