1 files changed, 14 insertions, 2 deletions
diff --git a/config-db/slxconfig b/config-db/slxconfig
index d4656e5e..02029a81 100755
--- a/config-db/slxconfig
+++ b/config-db/slxconfig
@@ -269,12 +269,24 @@ sub checkGivenStage3Attrs
     my $stage3Attrs  = shift;
     my $vendorOSID   = shift;
     
+    my $attrProblems;
+
     if ($vendorOSID) {
         my $vendorOS = $openslxDB->fetchVendorOSByID($vendorOSID);
-        OpenSLX::AttributeRoster->checkValues($stage3Attrs, $vendorOS->{name});
+        my @installedPlugins = $openslxDB->fetchInstalledPlugins($vendorOSID);
+        $attrProblems = OpenSLX::AttributeRoster->findProblematicValues(
+            $stage3Attrs, $vendorOS->{name}, \@installedPlugins
+        );
     }
     else {
-        OpenSLX::AttributeRoster->checkValues($stage3Attrs);
+        $attrProblems = OpenSLX::AttributeRoster->findProblematicValues(
+            $stage3Attrs
+        );
+    }
+
+    if ($attrProblems) {
+        my $complaint = join "\n", @$attrProblems;
+        die $complaint;
     }
 
     return 1;