diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index f6ac72faf092a98a14c1d5a80e3768288cd79701..c93d5e4b7e4c1ebd0ea27f7870082b84c5dc1ac5 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6604,9 +6604,6 @@ class LUCreateInstance(LogicalUnit):
       self.op.instance_name = self.hostname1.name
       # used in CheckPrereq for ip ping check
       self.check_ip = self.hostname1.ip
-    elif self.op.mode == constants.INSTANCE_REMOTE_IMPORT:
-      raise errors.OpPrereqError("Remote imports require names to be checked" %
-                                 errors.ECODE_INVAL)
     else:
       self.check_ip = None
 
diff --git a/lib/config.py b/lib/config.py
index e7f9c4e00182ab64a3c1e9da8d70351429e03efe..3276795f198b98e369035d9f9b30f663d74d9e4c 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -457,7 +457,7 @@ class ConfigWriter:
       if [node.master_candidate, node.drained, node.offline].count(True) > 1:
         result.append("Node %s state is invalid: master_candidate=%s,"
                       " drain=%s, offline=%s" %
-                      (node.name, node.master_candidate, node.drain,
+                      (node.name, node.master_candidate, node.drained,
                        node.offline))
 
     # nodegroups checks