lib/watir-webdriver/locators/element_locator.rb in watir-webdriver-0.0.1.dev5 vs lib/watir-webdriver/locators/element_locator.rb in watir-webdriver-0.0.1.dev6

@@ -22,11 +22,11 @@
       if @selector.size == 1
         find_first_by_one
       else
         find_first_by_multiple
       end
-    rescue WebDriver::Error::WebDriverError => wde
+    rescue WebDriver::Error::NoSuchElementError => wde
       nil
     end
 
     def locate_all
       if @selector.size == 1
@@ -207,10 +207,10 @@
 
       element  = @wd.find_element(:id, id)
       return if tag_name && !tag_name_matches?(element, tag_name)
 
       element
-    rescue WebDriver::Error::WebDriverError => wde
+    rescue WebDriver::Error::NoSuchElementError => wde
       nil
     end
 
     def tag_name_matches?(element, tag_name)
       tag_name === element.tag_name