diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 4ffd1112b..966756ae7 100644
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -1001,9 +1001,9 @@ FW_answerCall($)
     return -1;
   }
 
-  if($FW_lastWebName ne $FW_wname || $FW_lastHashUpdate != $lastDefChange) {
+  if($FW_lastWebName ne $FW_cname || $FW_lastHashUpdate != $lastDefChange) {
     FW_updateHashes();
-    $FW_lastWebName = $FW_wname;
+    $FW_lastWebName = $FW_cname;
     $FW_lastHashUpdate = $lastDefChange;
   }
 
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 336a00755..8b692d55e 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -2896,7 +2896,7 @@ CommandAttr($$)
   my $a1 = $a[1];
   return "$a[0]: bad attribute name '$a1' (allowed chars: A-Za-z/\\d_\\.-)"
            if($featurelevel > 5.9 && !goodReadingName($a1) && $a1 ne "?");
-  return "attr $param: attribute value is missing" if($#a < 2);
+  return "attr $param: attribute value is missing" if($#a < 2 && $a1 ne "?");
 
   my @rets;
   foreach my $sdev (devspec2array($a[0], $a1 && $a1 eq "?" ? undef : $cl)) {