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 af0fe5226..b259e0e3b 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
@@ -1310,8 +1310,6 @@ sub checkTargetDynamicAttributes {
 	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);
@@ -1320,6 +1318,8 @@ sub checkTargetDynamicAttributes {
 
 	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})) {