diff --git a/src/driver/scanepg.cpp b/src/driver/scanepg.cpp
index 39e89bb5b..f2bbf6811 100644
--- a/src/driver/scanepg.cpp
+++ b/src/driver/scanepg.cpp
@@ -160,7 +160,7 @@ bool CEpgScan::AddSelected()
 
 void CEpgScan::AddTransponders()
 {
-	if(bouquetList->Bouquets.empty())
+	if(!bouquetList || bouquetList->Bouquets.empty())
 		return;
 
 	if (current_mode != g_settings.epg_scan) {
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index d8a09a22b..0212c4d73 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -121,17 +121,24 @@ CMoviePlayerGui::CMoviePlayerGui()
 
 CMoviePlayerGui::~CMoviePlayerGui()
 {
-	//playback->Close();
 	if (this == instance_mp)
 		stopPlayBack();
-	delete moviebrowser;
-	moviebrowser = NULL;
-	delete filebrowser;
-	filebrowser = NULL;
-	delete bookmarkmanager;
-	bookmarkmanager = NULL;
-	delete playback;
-	playback = NULL;
+	if(moviebrowser){
+		delete moviebrowser;
+		moviebrowser = NULL;
+	}
+	if(filebrowser){
+		delete filebrowser;
+		filebrowser = NULL;
+	}
+	if(bookmarkmanager){
+		delete bookmarkmanager;
+		bookmarkmanager = NULL;
+	}
+	if(playback){
+		delete playback;
+		playback = NULL;
+	}
 	if (this == instance_mp) {
 		delete instance_bg;
 		instance_bg = NULL;