diff --git a/ipaserver/install/plugins/update_idranges.py b/ipaserver/install/plugins/update_idranges.py
index 9fce5366a..cce83b12c 100644
--- a/ipaserver/install/plugins/update_idranges.py
+++ b/ipaserver/install/plugins/update_idranges.py
@@ -51,7 +51,7 @@ class update_idrange_type(Updater):
                 (entries, truncated) = ldap.find_entries(search_filter,
                     ['objectclass'], base_dn, time_limit=0, size_limit=0)
 
-            except errors.NotFound:
+            except errors.EmptyResult:
                 logger.debug("update_idrange_type: no ID range without "
                              "type set found")
                 return False, []
@@ -61,11 +61,6 @@ class update_idrange_type(Updater):
                              "of ranges with no type set: %s", e)
                 return False, []
 
-            if not entries:
-                # No entry was returned, rather break than continue cycling
-                logger.debug("update_idrange_type: no ID range was returned")
-                return False, []
-
             logger.debug("update_idrange_type: found %d "
                          "idranges to update, truncated: %s",
                          len(entries), truncated)