diff --git a/app/models/wiki_reference.rb b/app/models/wiki_reference.rb
index 4c2d027f..5e8ffae5 100644
--- a/app/models/wiki_reference.rb
+++ b/app/models/wiki_reference.rb
@@ -55,7 +55,8 @@ class WikiReference < ActiveRecord::Base
   def self.pages_redirected_to(web, page_name)
     names = []
     page = web.page(page_name)
-    Thread.current[:page_redirects][page.name].each { |name| names = names + self.pages_that_reference(web, name) }
+    redirected_pages = Thread.current[:page_redirects][page.name]
+    redirected_pages.each { |name| names = names + self.pages_that_reference(web, name) } if redirected_pages
     names.uniq    
   end
 
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index a5498ae7..42621a14 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -1,5 +1,5 @@
 <%- 
-  @title = "Editing #{CGI.escapeHTML(@page.name)}"
+  @title = "Editing #{@page.name.escapeHTML}"
   @content_width = 720
   @hide_navigation = true
 -%>
@@ -41,6 +41,7 @@
 	<%- end -%>
 
 <script type="text/javascript">
+<!--//--><![CDATA[//><!--
 function toggleVisibility() {
   var span = document.getElementById('title_change');
   if (span.style.display =='inline') {
@@ -67,4 +68,5 @@ function cleanAuthorName() {
 }
 
 document.forms["editForm"].elements["content"].focus();
+//--><!]]>
 </script>