diff --git a/app/models/relation.rb b/app/models/relation.rb
index 559b78440..58add6dd0 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -17,13 +17,11 @@ class Relation < ActiveRecord::Base
       doc = p.parse
 
       doc.find('//osm/relation').each do |pt|
-	relation = Relation.from_xml_node pt, create
+	return Relation.from_xml_node(pt, create)
       end
     rescue
-      relation = nil
+      return nil
     end
-
-    return relation
   end
 
   def self.from_xml_node(pt, create=false)
diff --git a/app/models/way.rb b/app/models/way.rb
index e16ec53e0..255f4329f 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -18,13 +18,11 @@ class Way < ActiveRecord::Base
       doc = p.parse
 
       doc.find('//osm/way').each do |pt|
-	way = Way.from_xml_node pt, create
+	return Way.from_xml_node(pt, create)
       end
     rescue
-      way = nil
+      return nil
     end
-
-    return way
   end
 
   def self.from_xml_node(pt, create=false)