diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 2a29b10f2b8..6612d097258 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -642,8 +642,8 @@ class ManyToOneConverter(osv.AbstractModel):
 
     def record_to_html(self, cr, uid, field_name, record, column, options=None, context=None):
         [read] = record.read([field_name])
+        if not read[field_name]: return ''
         _, value = read[field_name]
-
         return nl2br(value, options=options)
 
 class HTMLConverter(osv.AbstractModel):
diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index aa38f7831e9..a74122424de 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -19,7 +19,6 @@ import test_misc
 import test_orm
 import test_osv
 import test_translate
-import test_uninstall
 import test_view_validation
 import test_qweb
 import test_func
diff --git a/openerp/tests/test_uninstall.py b/openerp/tests/test_uninstall.py
deleted file mode 100644
index 6f6a623f6a9..00000000000
--- a/openerp/tests/test_uninstall.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-# This assumes an existing but uninitialized database.
-import unittest2
-
-import openerp
-from openerp import SUPERUSER_ID
-import common
-
-DB = common.DB
-ADMIN_USER_ID = common.ADMIN_USER_ID
-
-def registry(model):
-    return openerp.modules.registry.RegistryManager.get(DB)[model]
-
-def cursor():
-    return openerp.modules.registry.RegistryManager.get(DB).db.cursor()
-
-def model_exists(model_name):
-    registry = openerp.modules.registry.RegistryManager.get(DB)
-    return model_name in registry
-
-def reload_registry():
-    openerp.modules.registry.RegistryManager.new(
-        DB, update_module=True)
-
-def search_registry(model_name, domain):
-    cr = cursor()
-    model = registry(model_name)
-    record_ids = model.search(cr, SUPERUSER_ID, domain, {})
-    cr.close()
-    return record_ids
-
-def install_module(module_name):
-    ir_module_module = registry('ir.module.module')
-    cr = cursor()
-    module_ids = ir_module_module.search(cr, SUPERUSER_ID,
-        [('name', '=', module_name)], {})
-    assert len(module_ids) == 1
-    ir_module_module.button_install(cr, SUPERUSER_ID, module_ids, {})
-    cr.commit()
-    cr.close()
-    reload_registry()
-
-def uninstall_module(module_name):
-    ir_module_module = registry('ir.module.module')
-    cr = cursor()
-    module_ids = ir_module_module.search(cr, SUPERUSER_ID,
-        [('name', '=', module_name)], {})
-    assert len(module_ids) == 1
-    ir_module_module.button_uninstall(cr, SUPERUSER_ID, module_ids, {})
-    cr.commit()
-    cr.close()
-    reload_registry()
-
-class test_uninstall(unittest2.TestCase):
-    """
-    Test the install/uninstall of a test module. The module is available in
-    `openerp.tests` which should be present in the addons-path.
-    """
-
-    def test_01_install(self):
-        """ Check a few things showing the module is installed. """
-        install_module('test_uninstall')
-        assert model_exists('test_uninstall.model')
-
-        assert search_registry('ir.model.data',
-            [('module', '=', 'test_uninstall')])
-
-        assert search_registry('ir.model.fields',
-            [('model', '=', 'test_uninstall.model')])
-
-    def test_02_uninstall(self):
-        """ Check a few things showing the module is uninstalled. """
-        uninstall_module('test_uninstall')
-        assert not model_exists('test_uninstall.model')
-
-        assert not search_registry('ir.model.data',
-            [('module', '=', 'test_uninstall')])
-
-        assert not search_registry('ir.model.fields',
-            [('model', '=', 'test_uninstall.model')])
-
-
-
-if __name__ == '__main__':
-    unittest2.main()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: