diff --git a/ChangeLog b/ChangeLog
index b03a860..3d368fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 Version 1.6.15
 *******************************************************************************
 
+2012-01-09 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
+
+	SF Bug tracker, ID: 3469344
+	Submitted: dimmman ( dimmman ) - 2012-01-04 01:44:29 PST
+	Details: Looking at the code (v1.6.14, upnptools.c) for UpnpResolveURL
+	and UpnpResolveURL2 it shows that the ExitFunction: always returns
+	UPNP_E_SUCCESS.
+
+	I'm farily sure it's a simple mistake that should have been "return ret;"
+	in both cases.
+
+	Br,
+	Jonny
 
 *******************************************************************************
 Version 1.6.14
diff --git a/upnp/src/api/upnptools.c b/upnp/src/api/upnptools.c
index c674bc0..c3d18a1 100644
--- a/upnp/src/api/upnptools.c
+++ b/upnp/src/api/upnptools.c
@@ -157,7 +157,7 @@ int UpnpResolveURL(
 		ret = UPNP_E_INVALID_URL;
 
 ExitFunction:
-	return UPNP_E_SUCCESS;
+	return ret;
 }
 
 
@@ -177,7 +177,7 @@ int UpnpResolveURL2(
 		ret = UPNP_E_INVALID_URL;
 
 ExitFunction:
-	return UPNP_E_SUCCESS;
+	return ret;
 }