diff --git a/lib/modules/Sql.pmod/pgsql.pike b/lib/modules/Sql.pmod/pgsql.pike
index 29253b8d0eeb0e36d5a9cd646f09b71075528ad2..0b1d4f4765b0513a376cc7b0766b53b9f335e4b6 100644
--- a/lib/modules/Sql.pmod/pgsql.pike
+++ b/lib/modules/Sql.pmod/pgsql.pike
@@ -192,7 +192,9 @@ protected string _sprintf(int type, void|mapping flags) {
 //!   @[Postgres.postgres], @[Sql.Sql], @[postgres->select_db]
 protected void create(void|string _host, void|string _database,
  void|string _user, void|string _pass, void|mapping(string:mixed) _options) {
-  pass = _pass; _pass = "CENSORED"; String.secure(pass);
+  pass = _pass; _pass = "CENSORED";
+  if(pass)
+    String.secure(pass);
   user = _user; database = _database; host = _host || PGSQL_DEFAULT_HOST;
   options = _options || ([]);
   if(search(host,":")>=0 && sscanf(_host,"%s:%d",host,port)!=2)
diff --git a/lib/modules/Sql.pmod/pgsqls.pike b/lib/modules/Sql.pmod/pgsqls.pike
index 94bbdd66ccb6537b4249daf7102ca6d55ab60c9c..0edae426a2e580853ecd62606aeff8a962c7a820 100644
--- a/lib/modules/Sql.pmod/pgsqls.pike
+++ b/lib/modules/Sql.pmod/pgsqls.pike
@@ -17,7 +17,9 @@ inherit Sql.pgsql;
 protected void create(void|string _host, void|string _db,
  void|string _user, void|string _pass, void|mapping(string:mixed) _options) {
   string pass;
-  pass = _pass; _pass = "CENSORED"; String.secure(pass);
+  pass = _pass; _pass = "CENSORED";
+  if(pass)
+    String.secure(pass);
   if(!_options)
     _options = ([]);