diff -Nru tuchulcha-0.10.0~bzr504~deb30~ubuntu12.10.1/debian/bzr-builder.manifest tuchulcha-0.10.0~bzr506~deb30~ubuntu12.10.1/debian/bzr-builder.manifest
--- tuchulcha-0.10.0~bzr504~deb30~ubuntu12.10.1/debian/bzr-builder.manifest	2013-11-21 17:11:34.000000000 +0000
+++ tuchulcha-0.10.0~bzr506~deb30~ubuntu12.10.1/debian/bzr-builder.manifest	2013-11-22 18:27:38.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}~bzr504~deb30
-lp:tuchulcha revid:gerald.mwangi@gmx.de-20131114134147-axl2hv13tecb3448
+# bzr-builder format 0.3 deb-version {debupstream}~bzr506~deb30
+lp:tuchulcha revid:stephan.meister@iwr.uni-heidelberg.de-20131122110721-u3mz56p72ijyg5tg
 nest packaging lp:~charon-developers/tuchulcha/dailydeb debian revid:jmgottfried@web.de-20131121161456-1fapxes90fel9a7w
diff -Nru tuchulcha-0.10.0~bzr504~deb30~ubuntu12.10.1/debian/changelog tuchulcha-0.10.0~bzr506~deb30~ubuntu12.10.1/debian/changelog
--- tuchulcha-0.10.0~bzr504~deb30~ubuntu12.10.1/debian/changelog	2013-11-21 17:11:34.000000000 +0000
+++ tuchulcha-0.10.0~bzr506~deb30~ubuntu12.10.1/debian/changelog	2013-11-22 18:27:38.000000000 +0000
@@ -1,8 +1,8 @@
-tuchulcha (0.10.0~bzr504~deb30~ubuntu12.10.1) quantal; urgency=low
+tuchulcha (0.10.0~bzr506~deb30~ubuntu12.10.1) quantal; urgency=low
 
   * Auto build.
 
- -- Jens-Malte Gottfried <jmgottfried@web.de>  Thu, 21 Nov 2013 17:11:34 +0000
+ -- Jens-Malte Gottfried <jmgottfried@web.de>  Fri, 22 Nov 2013 18:27:38 +0000
 
 tuchulcha (0.10.0) precise; urgency=low
 
diff -Nru tuchulcha-0.10.0~bzr504~deb30~ubuntu12.10.1/src/CharonRun.cpp tuchulcha-0.10.0~bzr506~deb30~ubuntu12.10.1/src/CharonRun.cpp
--- tuchulcha-0.10.0~bzr504~deb30~ubuntu12.10.1/src/CharonRun.cpp	2013-11-21 17:11:33.000000000 +0000
+++ tuchulcha-0.10.0~bzr506~deb30~ubuntu12.10.1/src/CharonRun.cpp	2013-11-22 18:27:37.000000000 +0000
@@ -148,6 +148,7 @@
 
 void CharonRun::updatePlugins() {
 	_taskStart();
+	QTextStream qout(stdout);
 
 	// delete old wrp files
 	const FileManager& fm = FileManager::instance();
@@ -164,8 +165,16 @@
 		metaPath.remove(wrpFiles[i]);
 		Q_ASSERT(success);
 	}
-
-	_setupMan();
+	try {
+		_setupMan();
+	}
+	catch(std::exception& err)
+	{
+		qout << "(EE) Could not set up PluginManager: " << err.what() << "\n"
+			 << "(EE) Please check that your local and global plugin paths "
+			 << "are set correctly in the options menu." << endl ;
+		return;
+	}
 	_man->createMetadata(metaPath.absolutePath().toStdString());
 	_freeMan();
 
diff -Nru tuchulcha-0.10.0~bzr504~deb30~ubuntu12.10.1/src/TuchulchaWindow.cpp tuchulcha-0.10.0~bzr506~deb30~ubuntu12.10.1/src/TuchulchaWindow.cpp
--- tuchulcha-0.10.0~bzr504~deb30~ubuntu12.10.1/src/TuchulchaWindow.cpp	2013-11-21 17:11:33.000000000 +0000
+++ tuchulcha-0.10.0~bzr506~deb30~ubuntu12.10.1/src/TuchulchaWindow.cpp	2013-11-22 18:27:37.000000000 +0000
@@ -641,6 +641,7 @@
 			SLOT(_showHelp(QString)));
 	dialog.exec();
 	QSettings settings;
-	_toolBar->setToolButtonStyle((Qt::ToolButtonStyle)
-		settings.value("toolButtonStyle",Qt::ToolButtonFollowStyle).toInt());
+    if(_toolBar)
+        _toolBar->setToolButtonStyle((Qt::ToolButtonStyle)
+            settings.value("toolButtonStyle",Qt::ToolButtonFollowStyle).toInt());
 }