diff --git a/lib/net/ldap/pdu.rb b/lib/net/ldap/pdu.rb
index fc94025..e5c1352 100644
--- a/lib/net/ldap/pdu.rb
+++ b/lib/net/ldap/pdu.rb
@@ -196,7 +196,7 @@ class Net::LDAP::PDU
   # be a good idea. Maybe this should be configurable.
   def parse_search_return(sequence)
     sequence.length >= 2 or raise Net::LDAP::PDU::Error, "Invalid Search Response length."
-    @search_entry = LDAP::Entry.new(sequence[0])
+    @search_entry = Net::LDAP::Entry.new(sequence[0])
     sequence[1].each { |seq| @search_entry[seq[0]] = seq[1] }
   end
   private :parse_search_return
@@ -270,6 +270,7 @@ module Net
     when "LdapPduError"
       warn "Net::#{name} has been deprecated. Use Net::LDAP::PDU::Error instead."
       Net::LDAP::PDU::Error
+    when 'LDAP'
     else
       super
     end