diff --git a/users_ldap_populate/model/populate_wizard.py b/users_ldap_populate/model/populate_wizard.py
index 6677e2245..ea1ea4ac9 100644
--- a/users_ldap_populate/model/populate_wizard.py
+++ b/users_ldap_populate/model/populate_wizard.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from osv import orm, fields
 
-class CompanyLDAPPopulateWizard(osv.TransientModel):
+
+class CompanyLDAPPopulateWizard(orm.TransientModel):
     _name = 'res.company.ldap.populate_wizard'
     _description = 'Populate users from LDAP'
     _columns = {
@@ -34,7 +35,6 @@ class CompanyLDAPPopulateWizard(osv.TransientModel):
 
     def create(self, cr, uid, vals, context=None):
         ldap_pool = self.pool.get('res.company.ldap')
-        users_pool = self.pool.get('res.users')
         if 'ldap_id' in vals:
             vals['users_created'] = ldap_pool.action_populate(
                 cr, uid, vals['ldap_id'], context=context)
diff --git a/users_ldap_populate/model/users_ldap.py b/users_ldap_populate/model/users_ldap.py
index f58388e8a..5b5f47fbb 100644
--- a/users_ldap_populate/model/users_ldap.py
+++ b/users_ldap_populate/model/users_ldap.py
@@ -21,18 +21,18 @@
 
 import re
 from ldap.filter import filter_format
-from openerp.osv import orm, fields
-import openerp.exceptions
+from openerp.osv import orm
 import logging
 
+
 class CompanyLDAP(orm.Model):
     _inherit = 'res.company.ldap'
-    
+
     def action_populate(self, cr, uid, ids, context=None):
         """
         Prepopulate the user table from one or more LDAP resources.
-        
-        Obviously, the option to create users must be toggled in 
+
+        Obviously, the option to create users must be toggled in
         the LDAP configuration.
 
         Return the number of users created (as far as we can tell).
@@ -54,7 +54,7 @@ class CompanyLDAP(orm.Model):
             if attribute_match:
                 login_attr = attribute_match.group(1)
             else:
-                raise osv.except_osv(
+                raise orm.except_orm(
                     "No login attribute found",
                     "Could not extract login attribute from filter %s" %
                     conf['ldap_filter'])