diff --git a/app/views/static/error.html.erb b/app/views/static/error.html.erb
index 5065e87d8..b81a62c0a 100644
--- a/app/views/static/error.html.erb
+++ b/app/views/static/error.html.erb
@@ -1,6 +1,4 @@
-<% if @error_message %>
-  <p><%= @error_message %></p>
-<% elsif CurrentUser.user.is_builder? %>
+<% if CurrentUser.user.is_builder? && @exception.present? %>
   <h1><%= @exception.class.to_s %> exception raised</h1>
   <ul style="font-family: monospace; font-size: 1.2em; list-style-type: none;">
     <li><%= @exception.message %></li>
@@ -8,6 +6,8 @@
       <li style="list-style-type: none;"><%= b %></li>
     <%- end -%>
   </ul>
+<% elsif @error_message %>
+  <p><%= @error_message %></p>
 <% else %>
   <p><%= @exception.message %></p>
 <% end %>