diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/lib/SCST/SCST.pm b/scstadmin/scstadmin.sysfs/scst-0.9.10/lib/SCST/SCST.pm
index bf8d20ee3..7af874d0f 100644
--- a/scstadmin/scstadmin.sysfs/scst-0.9.10/lib/SCST/SCST.pm
+++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/lib/SCST/SCST.pm
@@ -1007,8 +1007,6 @@ sub checkDriverDynamicAttributes {
 	my $driver = shift;
 	my $check = shift;
 
-	return FALSE if (!defined($check));
-
 	my $rc = $self->driverExists($driver);
 	return SCST_C_DRV_NO_DRIVER if (!$rc);
 	return $rc if (!$rc > 1);
@@ -1017,6 +1015,8 @@ sub checkDriverDynamicAttributes {
 
 	return SCST_C_FATAL_ERROR if (!defined($available));
 
+	return FALSE if (!defined($check));
+
 	if (ref($check) eq 'HASH') {
 		foreach my $attribute (keys %{$check}) {
 			if (!defined($$available{$attribute})) {