1 files changed, 2 insertions, 1 deletions
diff --git a/displaychannel.c b/displaychannel.c
index 0ddb514..5d2701a 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -46,7 +46,7 @@ void cSDDisplayChannel::SetChannel(const cChannel *Channel, int Number) {
     cString ChannelID("");
 
     if (Channel) {
-        ChannelName = Channel->Name();
+        ChannelName = Channel->Name() ? Channel->Name() : "";
         ChannelID = Channel->GetChannelID().ToString();
         if (!Channel->GroupSep()) {
             ChannelNumber = cString::sprintf("%d%s", Channel->Number(), Number ? "-" : "");
@@ -159,6 +159,7 @@ void cSDDisplayChannel::SetMessage(eMessageType Type, const char *Text) {
     channelView->ClearSignalBackground();
     channelView->ClearScraperContent();
     channelView->ClearAudioInfo();
+    channelView->ClearBitrates();
     channelView->DisplayMessage(Type, Text);
     groupSep = true;
 }