diff --git a/addons/base_module_publish/wizard/base_module_publish.py b/addons/base_module_publish/wizard/base_module_publish.py
index 74addefd82c..bfbba7676ad 100644
--- a/addons/base_module_publish/wizard/base_module_publish.py
+++ b/addons/base_module_publish/wizard/base_module_publish.py
@@ -129,7 +129,7 @@ upload_info_form = '''<?xml version="1.0"?>
     align="0.0" colspan="4"/>
     <field name="login"/>
     <newline/>
-    <field name="password"/>
+    <field name="password" password="True"/>
     <newline/>
     <field name="email"/>
 </form>'''
@@ -227,18 +227,18 @@ def _upload(self, cr, uid, datas, context):
         download = 'http://www.openerp.com/download/modules/'+res['module_filename']
         result = post_multipart('www.openerp.com', '/mtree_upload.php',
             [
-                ('login',datas['form']['login']),
-                ('password',datas['form']['password']),
-                ('module_name',mod.name)
+                ('login', datas['form']['login']),
+                ('password', datas['form']['password']),
+                ('module_name', str(mod.name))
             ], [
                 ('module', res['module_filename'], res['module_file'])
             ])
-        if result[0] == "1":
+        if result and result[0] == "1":
             raise wizard.except_wizard(_('Error'), _('Login failed!'))
-        elif result[0] == "2":
+        elif result and result[0] == "2":
             raise wizard.except_wizard(_('Error'),
                     _('This version of the module is already exist on the server'))
-        elif result[0] != "0":
+        elif result and result[0] != "0":
             raise wizard.except_wizard(_('Error'), _('Failed to upload the file'))
 
     updata = {
diff --git a/addons/base_module_publish/wizard/module_zip.py b/addons/base_module_publish/wizard/module_zip.py
index 4014927bf99..c582358df0a 100644
--- a/addons/base_module_publish/wizard/module_zip.py
+++ b/addons/base_module_publish/wizard/module_zip.py
@@ -56,21 +56,22 @@ def createzip(cr, uid, moduleid, context, b64enc=True, src=True):
                 _('Can not export module that is not installed!'))
 
     ad = tools.config['addons_path']
-    if os.path.isdir(os.path.join(ad, module.name)):
+    name = str(module.name)
+    if os.path.isdir(os.path.join(ad, name)):
         archname = StringIO.StringIO('wb')
         archive = PyZipFile(archname, "w", ZIP_DEFLATED)
-        archive.writepy(os.path.join(ad, module.name))
-        _zippy(archive, ad, module.name, src=src)
+        archive.writepy(os.path.join(ad, name))
+        _zippy(archive, ad, name, src=src)
         archive.close()
         val =archname.getvalue()
         archname.close()
-    elif os.path.isfile(os.path.join(ad, module.name + '.zip')):
-        val = file(os.path.join(ad, module.name + '.zip'), 'rb').read()
+    elif os.path.isfile(os.path.join(ad, name + '.zip')):
+        val = file(os.path.join(ad, name + '.zip'), 'rb').read()
     else:
         raise wizard.except_wizard(_('Error'), _('Could not find the module to export!'))
     if b64enc:
         val =base64.encodestring(val)
-    return {'module_file':val, 'module_filename': module.name + '-' + \
+    return {'module_file':val, 'module_filename': name + '-' + \
             (module.installed_version or '0') + '.zip'}