diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 0d92e8d574..a3f20d4c6e 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *CVS*
 
+* Added the possibility of marking fields as being in error without adding a message (using nil) to it that'll get displayed wth full_messages #208 [mjobin] 
+
 * Fixed Base.errors to be indifferent as to whether strings or symbols are used. Examples:
 
     Before:
diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
index 3262fc505b..eee0bd90c2 100644
--- a/railties/lib/webrick_server.rb
+++ b/railties/lib/webrick_server.rb
@@ -130,12 +130,13 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
         { :controller => $1, :action => "index" }
       when %r{^/#{component}/#{component}$} then
         { :controller => $1, :action => $2 }
+      when %r{^/#{component}/#{component}/#{id}$} then
+        { :controller => $1, :action => $2, :id => $3 }
+
       when %r{^/#{component}/#{component}/$} then
         { :module => $1, :controller => $2, :action => "index" }
       when %r{^/#{component}/#{component}/#{component}$} then
         { :module => $1, :controller => $2, :action => $3 }
-      when %r{^/#{component}/#{component}/#{id}$} then
-        { :controller => $1, :action => $2, :id => $3 }
       when %r{^/#{component}/#{component}/#{component}/#{id}$} then
         { :module => $1, :controller => $2, :action => $3, :id => $4 }
       else