diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 3651aa1a..184e8d56 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -207,7 +207,11 @@ class WikiController < ApplicationController
         end
       end
     else
-      redirect_to :web => @web_name, :action => 'new', :id => CGI.escape(@page_name)
+      if not @page_name.nil? and not @page_name.empty?
+        redirect_to :web => @web_name, :action => 'new', :id => CGI.escape(@page_name)
+      else
+        render_text 'Page name is not specified', '404 Not Found'
+      end
     end
   end
 
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 93bdb6d4..4e641b93 100755
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -552,6 +552,14 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_redirected_to :web => 'wiki1', :action => 'new', :id => 'UnknownPage'
   end
 
+  def test_show_no_page
+    r = process('show', 'id' => '', 'web' => 'wiki1')
+    assert_equal 404, r.response_code
+    
+    r = process('show', 'web' => 'wiki1')
+    assert_equal 404, r.response_code
+  end
+
 
   def test_tex
     r = process('tex', 'web' => 'wiki1', 'id' => 'HomePage')