diff --git a/app.rb b/app.rb
index bedf3554..47b005f4 100644
--- a/app.rb
+++ b/app.rb
@@ -44,7 +44,7 @@ error do
     from: 'web@neocities.org',
     to: 'errors@neocities.org',
     subject: "[Neocities Error] #{env['sinatra.error'].class}: #{env['sinatra.error'].message}",
-    body: erb(:'views/templates/email/error'),
+    body: erb(:'templates/email/error', layout: false),
     no_footer: true
   })
 
diff --git a/app/surf.rb b/app/surf.rb
index a02ad46e..95d819db 100644
--- a/app/surf.rb
+++ b/app/surf.rb
@@ -1,4 +1,5 @@
 get '/surf/?' do
+  @current_page = params[:current_page].to_i || 1
   params.delete 'tag' if params[:tag].nil? || params[:tag].strip.empty?
   site_dataset = browse_sites_dataset
   site_dataset = site_dataset.paginate @current_page, 1