diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index a2dbf4385..32b623f1e 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -44,9 +44,8 @@ class Registrar < ActiveRecord::Base
 
   after_save :update_whois_records
   def update_whois_records
-    if changed? && (changes.keys & WHOIS_TRIGGERS).present? 
-      whois_records.map(&:save) # slow currently
-    end
+    return true unless (changed? && (changes.keys & WHOIS_TRIGGERS).present?) 
+    whois_records.map(&:save) # slow currently
   end
 
   class << self
diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb
index e1a0f124b..3ea9a4c6b 100644
--- a/app/models/whois_record.rb
+++ b/app/models/whois_record.rb
@@ -1,5 +1,6 @@
 class WhoisRecord < ActiveRecord::Base
   belongs_to :domain
+  belongs_to :registrar
 
   validates :domain, :name, :body, :json, presence: true
 
diff --git a/lib/tasks/whois.rake b/lib/tasks/whois.rake
index 293a34d2d..efe21f9c5 100644
--- a/lib/tasks/whois.rake
+++ b/lib/tasks/whois.rake
@@ -8,7 +8,7 @@ namespace :whois do
     ActiveRecord::Base.uncached do
       puts "\n#{@i}"
       Domain.included.find_in_batches(batch_size: 10000) do |batch|
-        batch.map { |d| d.update_whois_record }
+        batch.map(&:update_whois_record)
         puts(@i += 10000)
         GC.start
       end