diff --git a/data/gui/msfgui.jar b/data/gui/msfgui.jar
index c48a59d195..1bd521526c 100644
Binary files a/data/gui/msfgui.jar and b/data/gui/msfgui.jar differ
diff --git a/external/source/gui/msfguijava/src/msfgui/MainFrame.java b/external/source/gui/msfguijava/src/msfgui/MainFrame.java
index 67356794f2..b4526f3965 100644
--- a/external/source/gui/msfguijava/src/msfgui/MainFrame.java
+++ b/external/source/gui/msfguijava/src/msfgui/MainFrame.java
@@ -1278,7 +1278,8 @@ nameloop:	for (int i = 0; i < names.length; i++) {
 	/** Refreshes the database tables. */
 	private void reloadDb() {
 		try { //First try to reset workspace to chosen workspace
-			rpcConn.execute("db.set_workspace", MsfguiApp.getPropertiesNode().get("workspace"));
+			if(MsfguiApp.getPropertiesNode().containsKey("workspace"))
+				rpcConn.execute("db.set_workspace", MsfguiApp.getPropertiesNode().get("workspace"));
 		} catch (MsfException mex) {
 			if(!mex.getMessage().equals("database not loaded"))
 				mex.printStackTrace();