diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index df3700b1..1f011cfe 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -672,6 +672,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for making the 'epg.data' file being read after all plugins have been started
  for reporting a problem with cReceivers that use a ring buffer and didn't immediately
  return from their Receive() function if the buffer runs full
+ for reporting a crash in case there is no DVB hardware present
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
diff --git a/HISTORY b/HISTORY
index 9bd9fb45..1a7ff0fb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2550,3 +2550,5 @@ Video Disk Recorder Revision History
   control if and how channels will be automatically updated (see MANUAL).
   This has already been part of the 'autopid' patch by Andreas Schultz and has
   now been adopted.
+- Fixed a crash in case there is no DVB hardware present (thanks to Sascha
+  Volkenandt for reporting this one).
diff --git a/dvbdevice.c b/dvbdevice.c
index 15c6786d..f9ae5760 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 1.76 2004/01/04 12:28:00 kls Exp $
+ * $Id: dvbdevice.c 1.77 2004/01/05 12:24:18 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -772,7 +772,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
 bool cDvbDevice::HasLock(void)
 {
-  return dvbTuner->Locked();
+  return dvbTuner ? dvbTuner->Locked() : false;
 }
 
 void cDvbDevice::SetVolumeDevice(int Volume)