diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java
index 7f4cd9c..89e5da5 100644
--- a/src/com/sheepit/client/Client.java
+++ b/src/com/sheepit/client/Client.java
@@ -387,12 +387,14 @@ public class Client {
 		if (this.server == null) {
 			return 0;
 		}
-		
-		try {
-			this.server.HTTPRequest(this.server.getPage("logout"));
-		}
-		catch (IOException e) {
-			// nothing to do: if the logout failed that's ok
+
+		if (this.server.getPage("logout").isEmpty() == false) {
+			try {
+				this.server.HTTPRequest(this.server.getPage("logout"));
+			}
+			catch (IOException e) {
+				// nothing to do: if the logout failed that's ok
+			}
 		}
 		this.server.interrupt();
 		try {
diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java
index 1087b42..cdfd4a8 100644
--- a/src/com/sheepit/client/Server.java
+++ b/src/com/sheepit/client/Server.java
@@ -62,6 +62,7 @@ import com.sheepit.client.datamodel.FileMD5;
 import com.sheepit.client.datamodel.HeartBeatInfos;
 import com.sheepit.client.datamodel.JobInfos;
 import com.sheepit.client.datamodel.JobValidation;
+import com.sheepit.client.datamodel.RequestEndPoint;
 import com.sheepit.client.datamodel.ServerConfig;
 import lombok.Getter;
 import org.simpleframework.xml.core.Persister;
@@ -769,7 +770,10 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
 	
 	public String getPage(String key) {
 		if (this.serverConfig != null) {
-			return this.base_url + this.serverConfig.getRequestEndPoint(key).getPath();
+			RequestEndPoint endpoint = this.serverConfig.getRequestEndPoint(key);
+			if (endpoint != null) {
+				return this.base_url + endpoint.getPath();
+			}
 		}
 		return "";
 	}