diff --git a/app/models/legacy/object_state.rb b/app/models/legacy/object_state.rb
index f40f7a27d..0a59cf021 100644
--- a/app/models/legacy/object_state.rb
+++ b/app/models/legacy/object_state.rb
@@ -3,28 +3,47 @@ module Legacy
     self.table_name = :object_state
 
     def name
+      # legacy values
+      # 2 => "serverRenewProhibited",
+      # 5 => "serverOutzoneManual",
+      # 6 => "serverInzoneManual",
+      # 7 => "serverBlocked",
+      # 8 => "expirationWarning",
+      # 9 => "expired",
+      # 10 => "unguarded",
+      # 11 => "validationWarning1",
+      # 12 => "validationWarning2",
+      # 13 => "notValidated",
+      # 14 => "nssetMissing",
+      # 15 => "outzone",
+      # 18 => "serverRegistrantChangeProhibited",
+      # 19 => "deleteWarning",
+      # 20 => "outzoneUnguarded",
+      # 1 => "serverDeleteProhibited",
+      # 3 => "serverTransferProhibited",
+      # 4 => "serverUpdateProhibited",
+      # 16 => "linked",
+      # 17 => "deleteCandidate",
+      # 21 => "forceDelete"
+
+      # new values
       map = {
         2 => "serverRenewProhibited",
-        5 => "serverOutzoneManual",
-        6 => "serverInzoneManual",
+        5 => "serverHold",
+        6 => "serverManualInzone",
         7 => "serverBlocked",
-        8 => "expirationWarning",
         9 => "expired",
-        10 => "unguarded",
         11 => "validationWarning1",
-        12 => "validationWarning2",
         13 => "notValidated",
         14 => "nssetMissing",
-        15 => "outzone",
+        15 => "serverHold",
         18 => "serverRegistrantChangeProhibited",
-        19 => "deleteWarning",
-        20 => "outzoneUnguarded",
         1 => "serverDeleteProhibited",
         3 => "serverTransferProhibited",
         4 => "serverUpdateProhibited",
         16 => "linked",
-        17 => "deleteCandidate",
-        21 => "forceDelete"
+        17 => "deleteCandidate", # grupistaatus
+        21 => "forceDelete" # grupistaatus
       }
 
       map[state_id]
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index eb9e13b29..8ab52d610 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -281,6 +281,7 @@ namespace :import do
 
         # domain statuses
         x.object_states.each do |state|
+          next if state.name.blank?
           domain_statuses << [
             state.desc,
             state.name,