diff --git a/client/expected/10_admin0_test.out b/client/expected/10_admin0_test.out
index 41d3ade..3cd67d5 100644
--- a/client/expected/10_admin0_test.out
+++ b/client/expected/10_admin0_test.out
@@ -12,7 +12,7 @@ $$ LANGUAGE 'plpgsql';
 SELECT cdb_geocode_admin0_polygon('Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_admin0_polygon(2): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params ("test_user", Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin0_polygon(username, country_name)"
-PL/pgSQL function cdb_geocode_admin0_polygon(text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_admin0_polygon(text) line 13 at SQL statement
  cdb_geocode_admin0_polygon 
 ----------------------------
  
diff --git a/client/expected/20_admin1_test.out b/client/expected/20_admin1_test.out
index 693c478..5347364 100644
--- a/client/expected/20_admin1_test.out
+++ b/client/expected/20_admin1_test.out
@@ -19,7 +19,7 @@ $$ LANGUAGE 'plpgsql';
 SELECT cdb_geocode_admin1_polygon('California');
 NOTICE:  cdb_geocoder_client._cdb_geocode_admin1_polygon(2): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params ("test_user", California)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin1_polygon(username, admin1_name)"
-PL/pgSQL function cdb_geocode_admin1_polygon(text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_admin1_polygon(text) line 13 at SQL statement
  cdb_geocode_admin1_polygon 
 ----------------------------
  
@@ -28,7 +28,7 @@ PL/pgSQL function cdb_geocode_admin1_polygon(text) line 10 at SQL statement
 SELECT cdb_geocode_admin1_polygon('California', 'United States');
 NOTICE:  cdb_geocoder_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params ("test_user", California, United States)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin1_polygon(username, admin1_name, country_name)"
-PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 13 at SQL statement
  cdb_geocode_admin1_polygon 
 ----------------------------
  
diff --git a/client/expected/30_namedplaces_test.out b/client/expected/30_namedplaces_test.out
index e4891fd..d137f31 100644
--- a/client/expected/30_namedplaces_test.out
+++ b/client/expected/30_namedplaces_test.out
@@ -26,7 +26,7 @@ $$ LANGUAGE 'plpgsql';
 SELECT cdb_geocode_namedplace_point('Elx');
 NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(2): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", Elx)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(username, city_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_namedplace_point(text) line 13 at SQL statement
  cdb_geocode_namedplace_point 
 ------------------------------
  
@@ -35,7 +35,7 @@ PL/pgSQL function cdb_geocode_namedplace_point(text) line 10 at SQL statement
 SELECT cdb_geocode_namedplace_point('Elx', 'Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", Elx, Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(username, city_name, country_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 13 at SQL statement
  cdb_geocode_namedplace_point 
 ------------------------------
  
@@ -44,7 +44,7 @@ PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 10 at SQL stateme
 SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", Elx, Valencia, Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(username, city_name, admin1_name, country_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 13 at SQL statement
  cdb_geocode_namedplace_point 
 ------------------------------
  
diff --git a/client/expected/40_postalcodes_test.out b/client/expected/40_postalcodes_test.out
index 478bb72..d17e6ed 100644
--- a/client/expected/40_postalcodes_test.out
+++ b/client/expected/40_postalcodes_test.out
@@ -19,7 +19,7 @@ $$ LANGUAGE 'plpgsql';
 SELECT cdb_geocode_postalcode_polygon('03204', 'Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_postalcode_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params ("test_user", 03204, Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_postalcode_polygon(username, postal_code, country_name)"
-PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 13 at SQL statement
  cdb_geocode_postalcode_polygon 
 --------------------------------
  
@@ -28,7 +28,7 @@ PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 10 at SQL state
 SELECT cdb_geocode_postalcode_point('03204', 'Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_postalcode_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params ("test_user", 03204, Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_postalcode_point(username, postal_code, country_name)"
-PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 13 at SQL statement
  cdb_geocode_postalcode_point 
 ------------------------------
  
diff --git a/client/expected/50_ipaddresses_test.out b/client/expected/50_ipaddresses_test.out
index fb49053..f8d3456 100644
--- a/client/expected/50_ipaddresses_test.out
+++ b/client/expected/50_ipaddresses_test.out
@@ -12,7 +12,7 @@ $$ LANGUAGE 'plpgsql';
 SELECT cdb_geocode_ipaddress_point('8.8.8.8');
 NOTICE:  cdb_geocoder_client._cdb_geocode_ipaddress_point(2): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params ("test_user", 8.8.8.8)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_ipaddress_point(username, ip_address)"
-PL/pgSQL function cdb_geocode_ipaddress_point(text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_ipaddress_point(text) line 13 at SQL statement
  cdb_geocode_ipaddress_point 
 -----------------------------
  
diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out
index 8b0c6c9..d44397c 100644
--- a/client/expected/90_permissions_test.out
+++ b/client/expected/90_permissions_test.out
@@ -7,7 +7,7 @@ SET search_path TO public,cartodb,cdb_geocoder_client;
 SELECT cdb_geocode_admin0_polygon('Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_admin0_polygon(2): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params ("test_user", Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin0_polygon(username, country_name)"
-PL/pgSQL function cdb_geocode_admin0_polygon(text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_admin0_polygon(text) line 13 at SQL statement
  cdb_geocode_admin0_polygon 
 ----------------------------
  
@@ -16,7 +16,7 @@ PL/pgSQL function cdb_geocode_admin0_polygon(text) line 10 at SQL statement
 SELECT cdb_geocode_admin1_polygon('California');
 NOTICE:  cdb_geocoder_client._cdb_geocode_admin1_polygon(2): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params ("test_user", California)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin1_polygon(username, admin1_name)"
-PL/pgSQL function cdb_geocode_admin1_polygon(text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_admin1_polygon(text) line 13 at SQL statement
  cdb_geocode_admin1_polygon 
 ----------------------------
  
@@ -25,7 +25,7 @@ PL/pgSQL function cdb_geocode_admin1_polygon(text) line 10 at SQL statement
 SELECT cdb_geocode_admin1_polygon('California', 'United States');
 NOTICE:  cdb_geocoder_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params ("test_user", California, United States)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin1_polygon(username, admin1_name, country_name)"
-PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 13 at SQL statement
  cdb_geocode_admin1_polygon 
 ----------------------------
  
@@ -34,7 +34,7 @@ PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 10 at SQL statement
 SELECT cdb_geocode_namedplace_point('Elx');
 NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(2): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", Elx)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(username, city_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_namedplace_point(text) line 13 at SQL statement
  cdb_geocode_namedplace_point 
 ------------------------------
  
@@ -43,7 +43,7 @@ PL/pgSQL function cdb_geocode_namedplace_point(text) line 10 at SQL statement
 SELECT cdb_geocode_namedplace_point('Elx', 'Valencia');
 NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", Elx, Valencia)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(username, city_name, country_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 13 at SQL statement
  cdb_geocode_namedplace_point 
 ------------------------------
  
@@ -52,7 +52,7 @@ PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 10 at SQL stateme
 SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", Elx, Valencia, Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(username, city_name, admin1_name, country_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 13 at SQL statement
  cdb_geocode_namedplace_point 
 ------------------------------
  
@@ -61,7 +61,7 @@ PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 10 at SQL st
 SELECT cdb_geocode_postalcode_polygon('03204', 'Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_postalcode_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params ("test_user", 03204, Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_postalcode_polygon(username, postal_code, country_name)"
-PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 13 at SQL statement
  cdb_geocode_postalcode_polygon 
 --------------------------------
  
@@ -70,7 +70,7 @@ PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 10 at SQL state
 SELECT cdb_geocode_postalcode_point('03204', 'Spain');
 NOTICE:  cdb_geocoder_client._cdb_geocode_postalcode_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params ("test_user", 03204, Spain)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_postalcode_point(username, postal_code, country_name)"
-PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 13 at SQL statement
  cdb_geocode_postalcode_point 
 ------------------------------
  
@@ -79,7 +79,7 @@ PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 10 at SQL stateme
 SELECT cdb_geocode_ipaddress_point('8.8.8.8');
 NOTICE:  cdb_geocoder_client._cdb_geocode_ipaddress_point(2): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params ("test_user", 8.8.8.8)
 CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_ipaddress_point(username, ip_address)"
-PL/pgSQL function cdb_geocode_ipaddress_point(text) line 10 at SQL statement
+PL/pgSQL function cdb_geocode_ipaddress_point(text) line 13 at SQL statement
  cdb_geocode_ipaddress_point 
 -----------------------------
  
diff --git a/client/templates/20_public_functions.erb b/client/templates/20_public_functions.erb
index d4a6072..1880ca6 100644
--- a/client/templates/20_public_functions.erb
+++ b/client/templates/20_public_functions.erb
@@ -13,7 +13,10 @@ BEGIN
   IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN
     RAISE EXCEPTION 'The api_key must be provided';
   END IF;
-  SELECT _CDB_username() INTO username;
+  SELECT _cdb_username() INTO username;
+  IF username IS NULL OR username = '' THEN
+    RAISE EXCEPTION 'Username is a mandatory argument, check it out';
+  END IF;
   SELECT <%= GEOCODER_CLIENT_SCHEMA %>._<%= name %>(username, <%= params %>) INTO ret;
   RETURN ret;
 END;