diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 02b4d5949..97e3a8554 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -70,7 +70,8 @@ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
 
 CPlugins::CPlugins()
 {
-	
+	frameBuffer = NULL;
+	number_of_plugins = 0;
 }
 
 bool CPlugins::plugin_exists(const std::string & filename)
@@ -216,10 +217,6 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 		{
 			plugin_data->key = atoi(parm.c_str());
 		}
-		else if (cmd == "pluginversion")
-		{
-			plugin_data->version = atoi(parm.c_str());
-		}
 		else if (cmd == "name")
 		{
 			plugin_data->name = parm;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index d069424f3..c476129a8 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2354,7 +2354,7 @@ _repeat:
 				 * other modes selected bouquet not restored */
 				SetChannelMode(old_mode);
 				bouquetList->activateBouquet(old_b, false);
-				if(bouquetList->Bouquets.empty())
+				if(!bouquetList->Bouquets.empty())
 					bouquetList->Bouquets[old_b]->channelList->setSelected(old_num);
 				StartSubtitles(mode == mode_tv);
 			}