diff --git a/lib/geocoder.rb b/lib/geocoder.rb
index 3c8a5d5ed181a155d0d47b540f7c8cdba271ec89..793056d370749681df328d2f2760fc015fb2840a 100644
--- a/lib/geocoder.rb
+++ b/lib/geocoder.rb
@@ -25,7 +25,7 @@ module Geocoder
   # Returns array [lat,lon] if found, nil if not found or if network error.
   #
   def self.fetch_coordinates(query)
-    doc = self.search(query)
+    return nil unless doc = self.search(query)
     
     # Make sure search found a result.
     e = doc.elements['kml/Response/Status/code']