diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index 0a6c45890..c9b01d439 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -474,7 +474,7 @@ do_save() {
 		    fi
 		fi
 		;;
-	    [Nn]o)
+	    [Nn]o|ipv4|ipv6)
 		;;
 	    *)
 		error_message "WARNING: Invalid value ($SAVE_IPSETS) for SAVE_IPSETS"
diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index fb7c4923f..56c70f456 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -8148,8 +8148,7 @@ sub create_save_ipsets() {
 	}
     } elsif ( $config{SAVE_IPSETS} ) {
 	emit( '    error_message "WARNING: No ipsets were saved"',
-	      "    #\n    # Indicate success so that the CLI doesn't attempt to save the sets\n    #",
-	      '    return 0',
+	      '    return 1',
 	      "}\n" );
     } else {
 	emit( '    true',