diff --git a/gulliver/thirdparty/creole/Creole.php b/gulliver/thirdparty/creole/Creole.php
index 72b5e1683..43dc43fd6 100644
--- a/gulliver/thirdparty/creole/Creole.php
+++ b/gulliver/thirdparty/creole/Creole.php
@@ -309,7 +309,11 @@ class Creole {
         );
 
         $info = parse_url($dsn);
-        $info['pass'] = urldecode($info['pass']);
+
+        if (!is_null($dsn)) {
+            $info['pass'] = urldecode($info['pass']);
+        }
+
         if (count($info) === 1) { // if there's only one element in result, then it must be the phptype
             $parsed['phptype'] = array_pop($info);
             return $parsed;