diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb
index fff757b95..d19e1d548 100644
--- a/app/models/nameserver.rb
+++ b/app/models/nameserver.rb
@@ -58,8 +58,8 @@ class Nameserver < ApplicationRecord
   end
 
   def hostname=(hostname)
-    self[:hostname] = SimpleIDN.to_unicode(hostname).gsub(/\.+$/, '')
-    self[:hostname_puny] = SimpleIDN.to_ascii(hostname).gsub(/\.+$/, '')
+    self[:hostname] = SimpleIDN.to_unicode(hostname)&.gsub(/\.+$/, '')
+    self[:hostname_puny] = SimpleIDN.to_ascii(hostname)&.gsub(/\.+$/, '')
   end
 
   class << self
diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml
index 4533c9293..6a278ea57 100644
--- a/app/views/admin/domains/partials/_version.haml
+++ b/app/views/admin/domains/partials/_version.haml
@@ -139,7 +139,7 @@
       %td{colspan: 9}
         = preserve do
           %pre
-            - formatted_req = Nokogiri::XML(domain.pending_json['frame'])
+            - formatted_req = Nokogiri::XML(domain.pending_json['frame'].to_json)
             - if formatted_req.errors.none?
               = formatted_req
             - else