diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 77226800d76f9c3874ba81427c490579489ab5ae..d97795ccf71bbb038922969e5738d5a52b7950cb 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2688,6 +2688,18 @@ class LUClusterVerifyGroup(LogicalUnit, _VerifyErrors):
              utils.CommaJoin(inst_config.secondary_nodes),
              code=self.ETYPE_WARNING)
 
+    if inst_config.disk_template not in constants.DTS_EXCL_STORAGE:
+      # Disk template not compatible with exclusive_storage: no instance
+      # node should have the flag set
+      es_flags = rpc.GetExclusiveStorageForNodeNames(self.cfg,
+                                                     inst_config.all_nodes)
+      es_nodes = [n for (n, es) in es_flags.items()
+                  if es]
+      _ErrorIf(es_nodes, constants.CV_EINSTANCEUNSUITABLENODE, instance,
+               "instance has template %s, which is not supported on nodes"
+               " that have exclusive storage set: %s",
+               inst_config.disk_template, utils.CommaJoin(es_nodes))
+
     if inst_config.disk_template in constants.DTS_INT_MIRROR:
       instance_nodes = utils.NiceSort(inst_config.all_nodes)
       instance_groups = {}
diff --git a/lib/constants.py b/lib/constants.py
index 2fc7ce9af8d05b51bd367ab12403af6b884cf255..fff1a662ead6e9267253e7baa7e5e93e7503e983 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -1476,6 +1476,9 @@ CV_EINSTANCESPLITGROUPS = \
 CV_EINSTANCEPOLICY = \
   (CV_TINSTANCE, "EINSTANCEPOLICY",
    "Instance does not meet policy")
+CV_EINSTANCEUNSUITABLENODE = \
+  (CV_TINSTANCE, "EINSTANCEUNSUITABLENODE",
+   "Instance running on nodes that are not suitable for it")
 CV_ENODEDRBD = \
   (CV_TNODE, "ENODEDRBD", "Error parsing the DRBD status file")
 CV_ENODEDRBDHELPER = \