--- metadata.cpp	2009-12-03 17:17:17.000000000 +0100
+++ /tmp/metadata.cpp	2009-12-03 17:16:46.000000000 +0100
@@ -411,6 +411,10 @@
             ){
             MESSAGE(VERBOSE_EPG_UPDATES, "Find channel by number %d", ChannelItem->getChannelNr());
             cChannel* Channel = Channels.GetByNumber(ChannelItem->getChannelNr());
+
+	    if (Channel==NULL)
+	    	continue;
+
             MESSAGE(VERBOSE_EPG_UPDATES, "Found channel with ID %s", *Channel->GetChannelID().ToString());
 
             const cSchedule* Schedule = Schedules->GetSchedule(Channel);
@@ -541,4 +545,4 @@
         return UPNP_CDS_E_NO_SUCH_OBJECT; // No such object;
     }
     return UPNP_SOAP_E_ACTION_FAILED;
-}
\ Kein Zeilenumbruch am Dateiende.
+}