diff --git a/app/settings.rb b/app/settings.rb
index 4d526dc8..ad513f46 100644
--- a/app/settings.rb
+++ b/app/settings.rb
@@ -164,6 +164,9 @@ post '/settings/:username/custom_domain' do
     else
       raise e
     end
+  rescue Socket::ResolutionError
+    flash[:error] = 'Temporary failure in name resolution, please try again later.'
+    redirect "/settings/#{@site.username}#custom_domain"
   end
 
   if @site.valid?