diff --git a/templates/acl.erb b/templates/acl.erb
index 139b46d..7400909 100644
--- a/templates/acl.erb
+++ b/templates/acl.erb
@@ -1,6 +1,6 @@
 
 acl <%= @name %> {
-<%- @addresses.each do |address| -%>
+<%- Array(@addresses).each do |address| -%>
 	<%= address %>;
 <%- end -%>
 };
diff --git a/templates/named.conf.erb b/templates/named.conf.erb
index 37b01f0..1b4c923 100644
--- a/templates/named.conf.erb
+++ b/templates/named.conf.erb
@@ -5,9 +5,9 @@ include "<%= @confdir %>/views.conf";
 
 options {
 	directory "<%= @cachedir %>";
-<%- if not @forwarders.empty? -%>
+<%- if @forwarders and @forwarders != '' -%>
 	forwarders {
-<%-   @forwarders.each do |forwarder| -%>
+<%-   Array(@forwarders).each do |forwarder| -%>
 		<%= forwarder %>;
 <%-   end -%>
 	};
diff --git a/templates/view.erb b/templates/view.erb
index 73b645f..839e1ef 100644
--- a/templates/view.erb
+++ b/templates/view.erb
@@ -1,17 +1,17 @@
 
 view "<%= @name %>" {
-<%- if not @match_clients.empty? -%>
+<%- if @match_clients and @match_clients != '' -%>
 	match-clients {
-<%- @match_clients.each do |match_client| -%>
+<%-   Array(@match_clients).each do |match_client| -%>
 		<%= match_client %>;
-<%- end -%>
+<%-   end -%>
 	};
 <%- end -%>
-<%- if not @match_destinations.empty? -%>
+<%- if @match_destinations and @match_destinations != '' -%>
 	match-destinations {
-<%- @match_destinations.each do |match_destination| -%>
+<%-   Array(@match_destinations).each do |match_destination| -%>
 		<%= match_destination %>;
-<%- end -%>
+<%-   end -%>
 	};
 <%- end -%>
 	recursion <%= @recursion ? 'yes' : 'no' %>;
@@ -19,7 +19,7 @@ view "<%= @name %>" {
 	include "<%= @confdir %>/named.conf.default-zones";
 <%- end -%>
 
-<%- @zones.each do |zone| -%>
+<%- Array(@zones).each do |zone| -%>
 	include "<%= @confdir %>/zones/<%= zone %>.conf";
 <%- end -%>
 };
diff --git a/templates/zone.conf.erb b/templates/zone.conf.erb
index 3cfb3fa..006376e 100644
--- a/templates/zone.conf.erb
+++ b/templates/zone.conf.erb
@@ -5,7 +5,7 @@ zone "<%= @_domain %>" {
 <%- if @has_zone_file -%>
 <%-   if @dnssec -%>
 	auto-dnssec maintain;
-<%-     if @key_directory == '' -%>
+<%-     if @key_directory and @key_directory != '' -%>
 	key-directory "<%= @cachedir %>/<%= @name %>";
 <%-     else -%>
         key-directory "<%= @key_directory %>";
@@ -15,48 +15,48 @@ zone "<%= @_domain %>" {
 	file "<%= @cachedir %>/<%= @name %>/<%= @_domain %>";
 <%-   end -%>
 	notify <%= @ns_notify ? 'yes' : 'no' %>;
-<%-   if not @also_notify.empty? -%>
+<%-   if @also_notify and @also_notify != '' -%>
 	also-notify {
-<%-     @also_notify.each do |server| -%>
+<%-     Array(@also_notify).each do |server| -%>
 		<%= server %>;
 <%-     end -%>
 	};
 <%-   end -%>
-<%-   if not @allow_notify.empty? -%>
+<%-   if @allow_notify and @allow_notify != '' -%>
 	allow-notify {
-<%-     @allow_notify.each do |server| -%>
+<%-     Array(@allow_notify).each do |server| -%>
 		<%= server %>;
 <%-     end -%>
 	};
 <%-   end -%>
 <%- end -%>
-<%- if not @masters.empty? -%>
+<%- if @masters and @masters != '' -%>
 	masters {
-<%- @masters.each do |master| -%>
+<%-   Array(@masters).each do |master| -%>
 		<%= master %>;
-<%- end -%>
+<%-   end -%>
 	};
 <%- end -%>
-<%- if not @allow_updates.empty? -%>
+<%- if @allow_updates and @allow_updates != '' -%>
 	allow-update {
-<%- @allow_updates.each do |allow_update| -%>
+<%-   Array(@allow_updates).each do |allow_update| -%>
 		<%= allow_update %>;
-<%- end -%>
+<%-   end -%>
 	};
 <%- end -%>
-<%- if not @allow_transfers.empty? -%>
+<%- if @allow_transfers and @allow_transfers != '' -%>
 	allow-transfer {
-<%- @allow_transfers.each do |allow_transfer| -%>
+<%-   Array(@allow_transfers).each do |allow_transfer| -%>
 		<%= allow_transfer %>;
-<%- end -%>
+<%-   end -%>
 	};
 <%- end -%>
 <%- if @forward != '' -%>
 	forward <%= @forward %>;
 <%- end -%>
-<%- if not @forwarders.empty? -%>
+<%- if @forwarders and @forwarders != '' -%>
 	forwarders {
-<%-   @forwarders.each do |forwarder| -%>
+<%-   Array(@forwarders).each do |forwarder| -%>
 		<%= forwarder %>;
 <%-   end -%>
 	};