diff --git a/scripts/deluge b/scripts/deluge
index 0d7ee9120..b7a9e3a2c 100755
--- a/scripts/deluge
+++ b/scripts/deluge
@@ -46,13 +46,13 @@ import deluge._dbus as dbus
 import deluge.interface
 import deluge.pref
 
-parser = OptionParser(usage="%prog [options] [torrents to add]", 
-                      version=deluge.common.PROGRAM_VERSION)
-parser.add_option("-c", "--config", dest="config",  help="Sets the configuration path")
-(options, args) = parser.parse_args()
-
 if not deluge.common.windows_check():
     import platform
+    i = 1
+    arguments = ""
+    while i < len(sys.argv):
+        arguments = arguments + " " + sys.argv[i]
+        i+=1
     if platform.system() == "Linux": # Add this, FreeBSD and other OSs than Linux do not have /etc/issue.
         print "checking for ubuntu..."
         if os.WEXITSTATUS(os.system('grep -iq "Ubuntu" /etc/issue')) == 0:
@@ -60,26 +60,21 @@ if not deluge.common.windows_check():
                 print "found and fixing ubuntu"
                 os.environ["MOZILLA_FIVE_HOME"] = "/usr/lib/firefox"
                 os.environ["LD_LIBRARY_PATH"] = "/usr/lib/firefox"
-                if (options.config != None):
-                    os.system("/usr/bin/deluge --config %s %s" %(options.config, args))
-                elif args:
-                    os.system("/usr/bin/deluge %s" %(args))
-                else:
-                    os.system("/usr/bin/deluge")
+                os.system("/usr/bin/deluge %s" % arguments)
                 raise SystemExit
     elif platform.system() == "FreeBSD":
         if os.environ.get("MOZILLA_FIVE_HOME") != "/usr/local/lib/firefox":
             print "found and fixing freebsd..."
             os.environ["MOZILLA_FIVE_HOME"] = "/usr/local/lib/firefox"
             os.environ["LD_LIBRARY_PATH"] = "/usr/local/lib/firefox"
-            if (options.config != None):
-                os.system("/usr/local/bin/deluge --config %s %s" %(options.config, args))
-            elif args:
-                os.system("/usr/local/bin/deluge %s" %(args))
-            else:
-                os.system("/usr/local/bin/deluge")
+            os.system("/usr/local/bin/deluge %s" % arguments)
             raise SystemExit
 
+parser = OptionParser(usage="%prog [options] [torrents to add]", 
+                      version=deluge.common.PROGRAM_VERSION)
+parser.add_option("-c", "--config", dest="config",  help="Sets the configuration path")
+(options, args) = parser.parse_args()
+
 if (options.config != None):
     deluge.common.CONFIG_DIR = options.config
 
@@ -126,7 +121,6 @@ Continuing...""" % pstate_file_path
 
 def get_cmd_line_torrents():
     cmd_line_torrents = []
-
     for torrent in args:
         if deluge.common.is_url(torrent):
             filename = deluge.common.fetch_url(torrent)
@@ -137,7 +131,6 @@ def get_cmd_line_torrents():
                 print "Error,", torrent, " does not seem to be a .torrent file"
             else:        
                 cmd_line_torrents.append(os.path.abspath(torrent))
-
     return cmd_line_torrents
 
 def start_deluge():
@@ -150,12 +143,12 @@ try:
     bus = dbus.SessionBus()
 except:
     if not deluge.common.windows_check():
+        while i < len(sys.argv):
+            arguments = arguments + " " + sys.argv[i]
+            i+=1
         pid = os.fork()
         if not pid:
-            if args:
-                os.popen('dbus-launch deluge %s' %args)
-            else:
-                os.popen('dbus-launch deluge')
+            os.popen('dbus-launch deluge %s' %arguments)
 else:
     dbus_objects = dbus.Interface(bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus'), 'org.freedesktop.DBus').ListNames()
 
diff --git a/src/common.py b/src/common.py
index c56442055..a02801c87 100644
--- a/src/common.py
+++ b/src/common.py
@@ -237,6 +237,8 @@ def send_info():
            except IOError:
                print "Network error while trying to send info"
            else:
+               if not os.path.exists(CONFIG_DIR):
+                   os.makedirs(CONFIG_DIR)
                f = open(os.path.join(CONFIG_DIR, 'infosent'), 'w')
                f.write("")
                f.close
diff --git a/src/core.py b/src/core.py
index a1b1b5f81..afa4eab16 100644
--- a/src/core.py
+++ b/src/core.py
@@ -321,7 +321,8 @@ class Manager:
         # Pickle the state so if we experience a crash, the latest state is 
         # available
         print "Pickling state..."
-
+        if not os.path.exists(self.base_dir):
+            os.makedirs(self.base_dir)
         output = open(os.path.join(self.base_dir, STATE_FILENAME), 'wb')
         pickle.dump(self.state, output)
         output.close()
diff --git a/src/wizard.py b/src/wizard.py
index ee016bae3..b93f5b16e 100644
--- a/src/wizard.py
+++ b/src/wizard.py
@@ -75,6 +75,8 @@ class WizardGTK:
         self.window.set_page_complete(self.wtree.get_widget('vbox3'), True)
         self.window.set_page_complete(self.wtree.get_widget('chk_send_info'), \
             True)
+        if not os.path.exists(deluge.common.CONFIG_DIR):
+            os.makedirs(deluge.common.CONFIG_DIR)
         config_file = deluge.common.CONFIG_DIR + "/prefs.state"
         self.config = deluge.pref.Preferences(config_file, False, 
             defaults={"listen_on" : [6881,6889],