diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp
index 58c35a4d..a98938fe 100644
--- a/src/net/common/clientstate.cpp
+++ b/src/net/common/clientstate.cpp
@@ -174,6 +174,9 @@ void
 ClientStateStartServerListDownload::Enter(boost::shared_ptr<ClientThread> client)
 {
 	path tmpServerListPath(client->GetCacheServerListFileName());
+	if (tmpServerListPath.empty())
+		throw ClientException(__FILE__, __LINE__, ERR_SOCK_INVALID_SERVERLIST_URL, 0);
+
 	if (exists(tmpServerListPath)) {
 		// Download the current server list once a day.
 		// If the previous file is older than one day, delete it.
diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
index 9055918c..145c3371 100644
--- a/src/net/common/clientthread.cpp
+++ b/src/net/common/clientthread.cpp
@@ -936,15 +936,16 @@ ClientThread::GetContext()
 string
 ClientThread::GetCacheServerListFileName()
 {
+	string fileName;
 	path tmpServerListPath(GetContext().GetCacheDir());
 	string serverListUrl(GetContext().GetServerListUrl());
 	// Retrieve the file name from the URL.
 	size_t pos = serverListUrl.find_last_of('/');
-	if (GetContext().GetCacheDir().empty() || serverListUrl.empty() || pos == string::npos || ++pos >= serverListUrl.length()) {
-		throw ClientException(__FILE__, __LINE__, ERR_SOCK_INVALID_SERVERLIST_URL, 0);
+	if (!GetContext().GetCacheDir().empty() && !serverListUrl.empty() && pos != string::npos && ++pos < serverListUrl.length()) {
+		tmpServerListPath /= serverListUrl.substr(pos);
+		fileName = tmpServerListPath.directory_string();
 	}
-	tmpServerListPath /= serverListUrl.substr(pos);
-	return tmpServerListPath.directory_string();
+	return fileName;
 }
 
 void