diff --git a/dlls/geoip/Makefile b/dlls/geoip/Makefile
index 5ec18dec..2decbcb3 100755
--- a/dlls/geoip/Makefile
+++ b/dlls/geoip/Makefile
@@ -15,7 +15,7 @@ PUBLIC_ROOT = ../../public
 
 PROJECT = geoip
 
-OBJECTS = amxxmodule.cpp GeoIP2/maxminddb.cpp geoip_main.cpp geoip_natives.cpp geoip_util.cpp
+OBJECTS = amxxmodule.cpp GeoIP2/maxminddb.c geoip_main.cpp geoip_natives.cpp geoip_util.cpp
 
 ##############################################
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
diff --git a/dlls/geoip/geoip_util.cpp b/dlls/geoip/geoip_util.cpp
index 16d95cf3..a805ae62 100644
--- a/dlls/geoip/geoip_util.cpp
+++ b/dlls/geoip/geoip_util.cpp
@@ -166,6 +166,9 @@ const char *lookupString(const char *ip, const char **path, int *length)
 
 	if (!lookupByIp(ip, path, &result))
 	{
+		if (length)
+			*length = 0;
+
 		return NULL;
 	}
 
diff --git a/dlls/geoip/msvc12/geoip.vcxproj b/dlls/geoip/msvc12/geoip.vcxproj
index 49ce2678..0e315478 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj
+++ b/dlls/geoip/msvc12/geoip.vcxproj
@@ -98,7 +98,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\GeoIP2\maxminddb.cpp" />
+    <ClCompile Include="..\GeoIP2\maxminddb.c" />
     <ClCompile Include="..\geoip_main.cpp" />
     <ClCompile Include="..\geoip_natives.cpp" />
     <ClCompile Include="..\geoip_util.cpp" />
@@ -120,4 +120,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/dlls/geoip/msvc12/geoip.vcxproj.filters b/dlls/geoip/msvc12/geoip.vcxproj.filters
index 3d3251a0..01d95974 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj.filters
+++ b/dlls/geoip/msvc12/geoip.vcxproj.filters
@@ -23,7 +23,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\GeoIP2\maxminddb.cpp">
+    <ClCompile Include="..\GeoIP2\maxminddb.c">
       <Filter>GeoIP2</Filter>
     </ClCompile>
     <ClCompile Include="..\geoip_util.cpp">
@@ -70,4 +70,4 @@
       <Filter>Pawn Includes</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>