diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp
index 48f5c22bd..baf767e73 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.cpp
+++ b/src/gui/bedit/bouqueteditor_chanselect.cpp
@@ -147,6 +147,8 @@ void CBEChannelSelectWidget::paintItem(uint32_t itemNr, int paintNr, bool pselec
 
 void CBEChannelSelectWidget::onOkKeyPressed()
 {
+	if (selected >= Channels.size())
+		return;
 	setModified();
 	if (isChannelInBouquet(selected))
 		g_bouquetManager->Bouquets[bouquet]->removeService(Channels[selected]->channel_id);
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 449e6561b..0d4ee75cc 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -931,7 +931,8 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 				}
 			} 
 			else if (msg == CRCInput::RC_ok) {
-				CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(this->selectedChannelEntry->channel->channel_id);
+				if (selectedChannelEntry)
+					CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(selectedChannelEntry->channel->channel_id);
 				current_bouquet = bouquetList->getActiveBouquetNumber();
 			} 
 			else if (CRCInput::isNumeric (msg)) {
@@ -1006,8 +1007,8 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 					menuWidgetActions.addItem (new CMenuForwarder (LOCALE_EPGPLUS_RECORD, true, NULL, &record, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED), false);
 				menuWidgetActions.addItem (new CMenuForwarder (LOCALE_EPGPLUS_REFRESH_EPG, true, NULL, &refresh, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN), false);
 				menuWidgetActions.addItem (new CMenuForwarder (LOCALE_EPGPLUS_REMIND, true, NULL, &remind, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW), false);
-
-				menuWidgetActions.exec (NULL, "");
+				if (selectedChannelEntry)
+					menuWidgetActions.exec (NULL, "");
 
 				this->refreshAll = true;
 			}