diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 735e8165..e7d9fb07 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1624,6 +1624,7 @@ Thomas G
  can use it
  for fixing converting arbitrarily formatted summary.vdr files
  for making the 'new' indicator in the Recordings menu kept up-to-date
+ for reporting a crash when setting the time transponder in the Setup menu
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
diff --git a/HISTORY b/HISTORY
index 0239a006..a97fd72d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4503,3 +4503,5 @@ Video Disk Recorder Revision History
 2006-04-14: Version 1.3.47
 
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed a crash when setting the time transponder in the Setup menu, caused by the
+  new 'noneString' in cMenuEditChanItem (reported by Thomas Günther). 
diff --git a/menuitems.c b/menuitems.c
index 0c368284..12d56963 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.36 2006/04/09 12:05:05 kls Exp $
+ * $Id: menuitems.c 1.37 2006/04/14 09:53:46 kls Exp $
  */
 
 #include "menuitems.h"
@@ -572,7 +572,7 @@ void cMenuEditChanItem::Set(void)
      snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
      SetValue(buf);
      }
-  else
+  else if (noneString)
      SetValue(noneString);
 }