diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index 65856a9fe..a7d0fafa0 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -1181,6 +1181,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
 					switch (emsg.eventID) {
 						case NeutrinoMessages::EVT_CURRENTEPG:
 						case NeutrinoMessages::EVT_NEXTEPG:
+						case NeutrinoMessages::EVT_NOEPG_YET:
 							{
 								CSectionsdClient::CurrentNextInfo *cn = (CSectionsdClient::CurrentNextInfo *) p;
 								delete [] cn;
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index e2c05c29b..5ad95d794 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -1985,6 +1985,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
 		std::string text = "No transponders found for ";
 		text += name;
 		ShowHint(LOCALE_MESSAGEBOX_ERROR, text.c_str(), 450, 2);
+		delete selector;
 		return menu_return::RETURN_REPAINT;
 	}