diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index f3f1acef..27baadba 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -339,7 +339,7 @@ module.exports = function(){
 
                     // skip looking up user_password if postgres_auth_pass
                     // doesn't contain the "user_password" label 
-                    if ( ! auth_pass.match(/\buser_password\b/) ) return null;
+                    if (!auth_pass || ! auth_pass.match(/\buser_password\b/) ) return null;
 
                     cartoData.getDatabasePassword(req, this);
                   },