diff --git a/HISTORY b/HISTORY
index a8093da..e081782 100644
--- a/HISTORY
+++ b/HISTORY
@@ -78,8 +78,9 @@ VDR Plugin 'iptv' Revision History
 - Updated for vdr-1.7.2.
 - Silenced a compilation warning.
 
-2009-02-24: Version 0.2.4
+2009-02-25: Version 0.2.4
 
 - Updated for vdr-1.7.4.
 - Fixed blacklisting of PAT section filter.
 - Set max IPTV device count to VDR's max devices.
+- Fixed a possible crash in sid scanner.
diff --git a/sidscanner.c b/sidscanner.c
index 37138ba..5cbf2fa 100644
--- a/sidscanner.c
+++ b/sidscanner.c
@@ -51,8 +51,9 @@ void cSidScanner::Process(u_short Pid, u_char Tid, const u_char *Data, int Lengt
                if (!Channels.Lock(true, 10))
                   return;
                cChannel *IptvChannel = Channels.GetByChannelID(channel.GetChannelID());
-               IptvChannel->SetId(IptvChannel->Nid(), IptvChannel->Tid(),
-                                  assoc.getServiceId(), IptvChannel->Rid());
+               if (IptvChannel)
+                  IptvChannel->SetId(IptvChannel->Nid(), IptvChannel->Tid(),
+                                    assoc.getServiceId(), IptvChannel->Rid());
                Channels.Unlock();
                }
             SetChannel(NULL);