diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index 4828bf114..d1020b1b2 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -102,6 +102,10 @@ int TunnelManager::eXosipSelect(int max_fds, fd_set *s1, fd_set *s2, fd_set *s3,
 
 
 void TunnelManager::addServer(const char *ip, int port,unsigned int udpMirrorPort,unsigned int delay) {
+	if (ip == NULL) {
+		ip = "";
+		ms_warning("Adding tunnel server with empty ip, it will not work!");
+	}
 	addServer(ip,port);
 	mUdpMirrorClients.push_back(UdpMirrorClient(ServerAddr(ip,udpMirrorPort),delay));
 }
diff --git a/gtk/update.c b/gtk/update.c
index 6fac1b8ff..34cff9995 100644
--- a/gtk/update.c
+++ b/gtk/update.c
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <wininet.h>
 
-static int linphone_gtk_get_new_version(const char *version_url, char *version, size_t size){
+static int linphone_gtk_create_version(const char *version_url, char *version, size_t size){
 	DWORD dwDownloaded = 0;
 	HINTERNET  hSession = NULL, hConnect = NULL;
 	int ret=-1;
@@ -55,7 +55,7 @@ static int linphone_gtk_get_new_version(const char *version_url, char *version,
 
 #else
 
-static int linphone_gtk_get_new_version(const char *url, char *version, size_t size){
+static int linphone_gtk_create_version(const char *url, char *version, size_t size){
 	
 	return -1;
 }
@@ -121,7 +121,7 @@ static int version_compare(const char *v1, const char *v2){
 static void *check_for_new_version(void *d){
 	const char *version_url=(const char *)d;
 	char version[256];
-	if (linphone_gtk_get_new_version(version_url,version,sizeof(version))==0){
+	if (linphone_gtk_create_version(version_url,version,sizeof(version))==0){
 		if (version_compare(version,LINPHONE_VERSION)>0){
 			const char *download_site=linphone_gtk_get_ui_config("download_site",NULL);
 			if (download_site)   {