diff --git a/functions/fw_builder.pp b/functions/fw_builder.pp
index 68f283bc1c6576f9dc68de100c7af7a72c53b6c9..bbd297e8de6378cb587d5fd224c2f8d1a15fe21e 100644
--- a/functions/fw_builder.pp
+++ b/functions/fw_builder.pp
@@ -133,6 +133,11 @@ function fw_builder::fw_builder() {
   #
   ['public', 'trust'].each() |$zone| {
     if $fw_conf[$zone] {
+      if $fw_conf[$zone].length() == 0 {
+        echo { 'WARNING fw_builder':
+          message => "fw_builder ${zone} key exists but it\'s empty";
+        }
+      }
       $fw_conf[$zone].each |$name , $conf| {
         $ports_spaces = $conf['port'] ? {
           Array => join($conf['port'], ' '),
diff --git a/functions/fw_builder_public_ips.pp b/functions/fw_builder_public_ips.pp
index c3fddbfadeb26cd67138dcae2e92082e4370ba62..2d6004266c3c675497ff1e6c3b645acb1ef0a545 100644
--- a/functions/fw_builder_public_ips.pp
+++ b/functions/fw_builder_public_ips.pp
@@ -29,9 +29,6 @@ function fw_builder::fw_builder_public_ips(
     $public_ipsets = []
   # if public is empty it's seen as empty string
   } elsif $facts_fw_conf['public'] =~ String or  $facts_fw_conf['public'] =~ Undef {
-    echo { 'WARNING: fw_builder_public_ips':
-      message => 'fw_builder public key exists but it\'s empty';
-    }
     $public_ipsets = []
   } else {
     # if public is present and contains some value