diff --git a/Shorewall-common/macro.Rfc1918 b/Shorewall-common/macro.Rfc1918
deleted file mode 100644
index 85cd2a332..000000000
--- a/Shorewall-common/macro.Rfc1918
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Shorewall version 4 - Rfc1918 Macro
-#
-# /usr/share/shorewall/macro.Rfc1918
-#
-#	This macro handles traffic with SOURCE or DEST reserved by RFC 1918.
-#
-###############################################################################
-PARAM	SOURCE	DEST:10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
-PARAM	SOURCE:10.0.0.0/8,172.16.0.0/12,192.168.0.0/16	DEST
diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall
index 024b39be7..e21cb8e8d 100755
--- a/Shorewall-common/shorewall
+++ b/Shorewall-common/shorewall
@@ -290,8 +290,10 @@ get_config() {
 	    MANGLE_ENABLED=
 	    ;;
 	*)
-	    echo "   ERROR: Invalid MANGLE_ENABLED setting ($MANGLE_ENABLED)" >&2
-	    exit 2
+	    if [ -n "$MANGLE_ENABLED" ]; then
+		echo "   ERROR: Invalid MANGLE_ENABLED setting ($MANGLE_ENABLED)" >&2
+		exit 2
+	    fi
 	    ;;
     esac
 }