diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index ab2439aa70f7d49c32d2279ae7ded59b2c1f275c..647ad505bee83c7d9772aac5bca31dd21b26bb61 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -121,15 +121,13 @@ class SimpleSAML_Auth_LDAP {
 			}
 		}
 
-		// If no DN was found after traversing all base DNs, return NULL or an exception.
-		if (@ldap_count_entries($this->ldap, $search_result) == 0) {
-			if ($allowZeroHits) {
-				return NULL;
-			} else {
-				throw new Exception('LDAP search returned zero entries: ' . $searchattr . '=' . $searchvalue . ' base(s): ' . 
-					join(' & ', $searchbases));
-			}
-		}		
+		if ($allowZeroHits) {
+			return NULL;
+		} else {
+			throw new Exception('LDAP search returned zero entries: ' . $searchattr . '=' . $searchvalue . ' base(s): ' . 
+				join(' & ', $searchbases));
+		}
+
 
 	}