diff --git a/FHEM/10_CUL_HM.pm b/FHEM/10_CUL_HM.pm
index 89270b4f7..5c556084c 100755
--- a/FHEM/10_CUL_HM.pm
+++ b/FHEM/10_CUL_HM.pm
@@ -198,10 +198,10 @@ CUL_HM_Parse($$)
   my $lcm = "$len$cmd";
 
   my $dhash = $modules{CUL_HM}{defptr}{$dst};
-  my $dname = $dhash ? $dhash->{NAME} : "unknown";
+  my $dname = $dhash ? $dhash->{NAME} :
+                       ($dst eq "000000" ? "broadcast" : 
+                       ($dst eq $id ? $iohash->{NAME} : $dst));
   my $target = ($dst eq $id) ? "" : " (to $dname)";
-  $dname = "broadcast" if($dst eq "000000");
-  $dname = $iohash->{NAME} if($dst eq $id);
 
   if($p =~ m/NACK$/) {  # HMLAN special
     if($dhash) {