diff --git a/app/site.rb b/app/site.rb
index 5cbd7c61..0d1342f8 100644
--- a/app/site.rb
+++ b/app/site.rb
@@ -85,7 +85,7 @@ end
 
 get '/site/:username/confirm_email/:token' do
   site = Site[username: params[:username]]
-  if site.email_confirmation_token == params[:token]
+  if !site.nil? && site.email_confirmation_token == params[:token]
     site.email_confirmed = true
     site.save_changes
 
diff --git a/app/site_files.rb b/app/site_files.rb
index 9de68caf..b3b98354 100644
--- a/app/site_files.rb
+++ b/app/site_files.rb
@@ -3,6 +3,12 @@ get '/site_files/new_page' do
   erb :'site_files/new_page'
 end
 
+# Redirect from original path
+get '/site_files/new' do
+  require_login
+  redirect '/site_files/new_page'
+end
+
 post '/site_files/create_page' do
   require_login
   @errors = []
@@ -31,11 +37,6 @@ post '/site_files/create_page' do
   redirect params[:dir] ? "/dashboard?dir=#{Rack::Utils.escape params[:dir]}" : '/dashboard'
 end
 
-get '/site_files/new' do
-  require_login
-  erb :'site_files/new'
-end
-
 def file_upload_response(error=nil)
   http_error_code = 406