Index: /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/PageRenamer.java
===================================================================
--- /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/PageRenamer.java	(revision 650242)
+++ /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/PageRenamer.java	(working copy)
@@ -235,20 +235,23 @@
         try
         {
 
-            WikiContext tempCtx = new WikiContext( m_wikiEngine, m_wikiEngine.getPage(referrerName) );
+            if( m_wikiEngine.getPage( referrerName ) != null )
+            {
+                WikiContext tempCtx = new WikiContext( m_wikiEngine, m_wikiEngine.getPage( referrerName ) );
 
-            if (context.getPage() != null)
-            {
-                PageLock lock = m_wikiEngine.getPageManager().getCurrentLock( context.getPage() );
-                m_wikiEngine.getPageManager().unlockPage( lock );
+                if( context.getPage() != null )
+                {
+                    PageLock lock = m_wikiEngine.getPageManager().getCurrentLock( context.getPage() );
+                    m_wikiEngine.getPageManager().unlockPage( lock );
 
-                tempCtx.getPage().setAuthor( context.getCurrentUser().getName() );
-                m_wikiEngine.saveText( tempCtx, text );
+                    tempCtx.getPage().setAuthor( context.getCurrentUser().getName() );
+                    m_wikiEngine.saveText( tempCtx, text );
 
-                Collection updatedReferrers = m_wikiEngine.scanWikiLinks( m_wikiEngine.getPage(referrerName),text );
+                    Collection updatedReferrers = m_wikiEngine.scanWikiLinks( m_wikiEngine.getPage( referrerName ), text );
 
-                m_wikiEngine.getReferenceManager().updateReferences( referrerName, updatedReferrers );
-             }
+                    m_wikiEngine.getReferenceManager().updateReferences( referrerName, updatedReferrers );
+                }
+            }
         }
         catch( WikiException e )
         {