diff --git a/gvim-wrapper.py b/gvim-wrapper.py
index bce9d9d..f92d2f1 100644
--- a/gvim-wrapper.py
+++ b/gvim-wrapper.py
@@ -49,13 +49,13 @@ def get_server_name(config, fname):
     return config['default_server']
 
 def main(argv):
-    if (len(argv) < 2):
-        return -1
     read_config_file(config, os.path.expanduser('~/.gvim-wrapper'))
-    fname = ' '.join(argv[1:])
-    servername = get_server_name(config, fname)
-    os.execv(config['vimdir'] + '\\gvim.exe',
-            ['gvim', '--servername', '"%s"' % servername, '--remote-tab-silent', '"' + fname + '"'])
+    fname = argv[1] if len(argv) >= 2 else ''
+    servername = get_server_name(config, fname if fname != '' else os.getcwd() + '/dum')
+    cmd = ['gvim', '--servername', '"%s"' % servername]
+    if fname != '':
+        cmd += ['--remote-tab-silent', '"%s"' % fname]
+    os.execv(config['vimdir'] + '\\gvim.exe', cmd)
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))