diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 85bb2405b..9f5f6e8ed 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -50,10 +50,10 @@ class rcube_imap_generic
 
     protected $fp;
     protected $host;
-    protected $prefs;
     protected $cmd_tag;
     protected $cmd_num = 0;
     protected $resourceid;
+    protected $prefs             = array();
     protected $logged            = false;
     protected $capability        = array();
     protected $capability_readed = false;
@@ -810,7 +810,7 @@ class rcube_imap_generic
      *
      * @return bool True on success, False on failure
      */
-    public function connect($host, $user, $password, $options = null)
+    public function connect($host, $user, $password, $options = array())
     {
         // configure
         $this->set_prefs($options);