diff --git a/.gitignore b/.gitignore
index f8519f9f..c0d48967 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ local.properties
 # Eclipse project files
 .classpath
 .project
+.settings/
diff --git a/core/libs/transdroid-connect.jar b/core/libs/transdroid-connect.jar
index 85b79c36..1fdbd664 100644
Binary files a/core/libs/transdroid-connect.jar and b/core/libs/transdroid-connect.jar differ
diff --git a/lib/src/org/transdroid/daemon/Bitflu/BitfluAdapter.java b/lib/src/org/transdroid/daemon/Bitflu/BitfluAdapter.java
index 6e762fa2..7c91d966 100644
--- a/lib/src/org/transdroid/daemon/Bitflu/BitfluAdapter.java
+++ b/lib/src/org/transdroid/daemon/Bitflu/BitfluAdapter.java
@@ -76,7 +76,6 @@ public class BitfluAdapter implements IDaemonAdapter {
 	private static final String RPC_TORRENT_FILES  = "showfiles-ext/";
 	private static final String RPC_START_DOWNLOAD = "startdownload/";
 	
-	private String            webuiroot = "";
 	private DaemonSettings    settings;
 	private DefaultHttpClient httpclient;
 
@@ -272,9 +271,6 @@ public class BitfluAdapter implements IDaemonAdapter {
 	private void initialise() throws DaemonException {
 
 		httpclient = HttpHelper.createStandardHttpClient(settings, true);
-		if(settings != null) {
-			webuiroot = settings.getFolder();
-		}
 	}
 	
 	/**
@@ -282,6 +278,9 @@ public class BitfluAdapter implements IDaemonAdapter {
 	 * @return The URL of the RPC API
 	 */
 	private String buildWebUIUrl() {
+		String webuiroot = "";
+		if (settings.getFolder() != null)
+			webuiroot = settings.getFolder();
 		return (settings.getSsl() ? "https://" : "http://") + settings.getAddress() + ":" + settings.getPort() + webuiroot + "/";
 	}