diff --git a/HISTORY b/HISTORY
index 6303e572..120f1ba5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6017,3 +6017,4 @@ Video Disk Recorder Revision History
 - Added missing virtual destructor to cPalette.
 - Now freeing configDirectory before setting it to a new value in
   cPlugin::SetConfigDirectory().
+- Fixed a crash when jumping to an editing mark in an audio recording.
diff --git a/dvbdevice.c b/dvbdevice.c
index 56001917..a1b2cfc4 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.12 2009/01/10 10:07:33 kls Exp $
+ * $Id: dvbdevice.c 2.13 2009/04/05 10:42:59 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1206,6 +1206,8 @@ void cDvbDevice::Mute(void)
 
 void cDvbDevice::StillPicture(const uchar *Data, int Length)
 {
+  if (!Data || Length < TS_SIZE)
+     return;
   if (Data[0] == 0x47) {
      // TS data
      cDevice::StillPicture(Data, Length);