diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a2909d58..10f4a3db 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3069,3 +3069,7 @@ Marc Perrudin <vdr@ekass.net>
 
 Bernard Jaulin <bernard.jaulin@gmail.com>
  for translating OSD texts to the French language
+
+Mikael Hübsch <mikael.hubsch@gmail.com>
+ for reporting a crash in cMenuEditChanItem::Set() when entering a channel number that
+ doesn't exist
diff --git a/HISTORY b/HISTORY
index 32eba1a4..8f173cb8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7585,7 +7585,7 @@ Video Disk Recorder Revision History
 - Fixed formatting and removed some superfluous break statements in vdr.c's command
   line option switch.
 
-2013-02-14: Version 1.7.38
+2013-02-15: Version 1.7.38
  
 - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
@@ -7620,3 +7620,5 @@ Video Disk Recorder Revision History
   config.h and using them to initialize Setup.NameInstantRecord (avoids having the same
   information in two places).
 - Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider.
+- Fixed a crash in cMenuEditChanItem::Set() when entering a channel number that
+  doesn't exist (reported by Mikael Hübsch).
diff --git a/menuitems.c b/menuitems.c
index 63f75898..f7ec7761 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 2.15 2012/12/23 13:44:05 kls Exp $
+ * $Id: menuitems.c 2.16 2013/02/15 14:20:29 kls Exp $
  */
 
 #include "menuitems.h"
@@ -759,7 +759,7 @@ void cMenuEditChanItem::Set(void)
      snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
      SetValue(buf);
      if (channelID)
-        *channelID = channel->GetChannelID().ToString();
+        *channelID = channel ? channel->GetChannelID().ToString() : "";
      }
   else if (noneString) {
      SetValue(noneString);