diff --git a/templates/options.erb b/templates/options.erb
index 83b86cf..e7f30be 100644
--- a/templates/options.erb
+++ b/templates/options.erb
@@ -1,40 +1,40 @@
 <%-
   def bool2str(v)
     case v
     when true
       'yes'
     when false
       'no'
     else
       v
     end
   end
 -%>
 <%- @options.keys.sort_by{ |sk| (sk.to_s.downcase.include? "match") ? 'zzz' + sk.to_s : sk.to_s }.each do |k| -%>
 <%- v = @options[k] -%>
 <%- if v.is_a?(Hash) -%>
 <%= k %>
 <%- v.keys.sort.each do |key| -%>
     <%- value = v[key] -%>
     <%- if value.is_a?(Array) -%>
     <%- value.each do |a| -%>
-    <%- if a != '' -%>
+    <%- if a != '' && a != nil -%>
     <%= key %> <%= bool2str(a) %>
     <%- end -%>
     <%- end -%>
-    <%- elsif value != '' -%>
+    <%- elsif value != '' && value != nil -%>
     <%= key %> <%= bool2str(value) %>
     <%- end -%>
 <%- end -%>
 <%- else -%>
 <%- if v.is_a?(Array) -%>
 <%- v.each do |a| -%>
-<%- if a != '' -%>
+<%- if a != '' && a != nil -%>
 <%= k %> <%= bool2str(a) %>
 <%- end -%>
 <%- end -%>
-<%- elsif v != :undef and v != '' -%>
+<%- elsif v != nil and v != '' -%>
 <%= k %> <%= bool2str(v) %>
 <%- end -%>
 <%- end -%>
 <%- end -%>
diff --git a/templates/sshd_config.erb b/templates/sshd_config.erb
index bd594a6..374441f 100644
--- a/templates/sshd_config.erb
+++ b/templates/sshd_config.erb
@@ -1,64 +1,64 @@
 # File is managed by Puppet
 <%-
   def bool2str(v)
     case v
     when true
       'yes'
     when false
       'no'
     else
       v
     end
   end
 -%>
 <%- options = scope.lookupvar('ssh::server::merged_options') -%>
 <%- if addressfamily = options.delete('AddressFamily') -%>
 AddressFamily <%= addressfamily %>
 <%- end -%>
 <%- if port = options.delete('Port') -%>
 <%- if port.is_a?(Array) -%>
 <%- port.reject{ |x| x.to_s.strip.empty? }.each do |p| -%>
 Port <%= p %>
 <%- end -%>
 <%- elsif not port.to_s.strip.empty? -%>
 Port <%= port %>
 <%- end -%>
 <%- end -%>
 <%- if listen = options.delete('ListenAddress') -%>
 <%- if listen.is_a?(Array) -%>
 <%- listen.reject{ |x| x.strip.empty? }.each do |l| -%>
 ListenAddress <%= l %>
 <%- end -%>
 <%- elsif not listen.strip.empty? -%>
 ListenAddress <%= listen %>
 <%- end -%>
 <%- end -%>
 
 <%- options.keys.sort_by{ |sk| (sk.to_s.downcase.include? "match") ? 'zzz' + sk.to_s : sk.to_s }.each do |k| -%>
 <%- v = options[k] -%>
 <%- if v.is_a?(Hash) -%>
 <%= k %>
 <%- v.keys.sort.each do |key| -%>
     <%- value = v[key] -%>
     <%- if value.is_a?(Array) -%>
     <%- value.each do |a| -%>
-    <%- if a != '' -%>
+    <%- if a != '' && a != nil -%>
     <%= key %> <%= bool2str(a) %>
     <%- end -%>
     <%- end -%>
-    <%- elsif value != '' -%>
+    <%- elsif value != '' && value != nil -%>
     <%= key %> <%= bool2str(value) %>
     <%- end -%>
 <%- end -%>
 <%- else -%>
 <%- if v.is_a?(Array) -%>
 <%- v.each do |a| -%>
-<%- if a != '' -%>
+<%- if a != '' && a != nil -%>
 <%= k %> <%= bool2str(a) %>
 <%- end -%>
 <%- end -%>
-<%- elsif v != :undef and v != '' -%>
+<%- elsif v != nil and v != '' -%>
 <%= k %> <%= bool2str(v) %>
 <%- end -%>
 <%- end -%>
 <%- end -%>