diff --git a/MainWindow.cpp b/MainWindow.cpp
index a6e1e6a..f630902 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -205,7 +205,7 @@ void MainWindow::setCurrentWorkspace(const QString &workspace)
 	addWorkspace(new_workspace);
 
 	if(!QDir::setCurrent(new_workspace))
-		QMessageBox::critical(this, tr("Error"), tr("Could not change current diectory"), QMessageBox::Ok );
+		QMessageBox::critical(this, tr("Error"), tr("Could not change current diectory to ")+new_workspace, QMessageBox::Ok );
 }
 
 //------------------------------------------------------------------------------
@@ -757,8 +757,12 @@ void MainWindow::loadSettings()
 	{
 		qsettings.setArrayIndex(i);
 		QString wk = qsettings.value("Path").toString();
-		if(!wk.isEmpty())
-			addWorkspace(wk);
+
+		// Skip invalid workspaces
+		if(wk.isEmpty() || !QDir(wk).exists())
+			continue;
+
+		addWorkspace(wk);
 
 		if(qsettings.contains("Active") && qsettings.value("Active").toBool())
 			setCurrentWorkspace(wk);
diff --git a/manifest b/manifest
index 994a826..3758639 100644
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
-C Upped\sversion\sto\s0.9.3
-D 2011-08-27T20:25:51.099
+C Remove\sinvalid\sworkspaces\sstored\sin\sthe\ssettings
+D 2011-08-29T14:43:46.790
 F CommitDialog.cpp a1fcdc94933f4e1a144224c7c70f1e067d3ee31e
 F CommitDialog.h 0550b1b652924ae54b6f6c9274cad2d4c491808a
 F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154
 F FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
 F FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
 F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7
-F MainWindow.cpp c94e1ca92238e61aa20d2bcaa3451aa68cdf85cb
+F MainWindow.cpp 93472d3e2f24070ac4738927cc3e55e865ece6c9
 F MainWindow.h 104f575b6fffe43880849c9ce8c8b986292e4d6c
 F MainWindow.ui 2f08596fe34f5496af90f6d355d4de857e77ad8a
 F RepoDialog.cpp 8f20e1511526973555c774350ec413dcecf51c9e
@@ -173,7 +173,7 @@ F icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
 F icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
 F main.cpp 083845039c167badd57a4abf482dd3d5e77aab35
 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
-P ebc405be8ad1ef5d86dff36a352528ccb363b3c9
-R 92692ee58642a7ffdb40fcdee94d2c5b
+P f00132a6072016db6840e2059bc8d332e760ecdb
+R cfe9e1ab63d013dd1b81a63a9d466db8
 U kostas
-Z 2fb38380d1398f0d62b438c7a69c9bea
+Z 5c2c25a81b23778f84b13b0b6bda4982
diff --git a/manifest.uuid b/manifest.uuid
index 2660ab6..ead6c94 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f00132a6072016db6840e2059bc8d332e760ecdb
\ No newline at end of file
+aa301610ecdf98433193c01c5ab7dfe32daf7227
\ No newline at end of file