diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index 7d8d27cf2..a317d1826 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -38,6 +38,7 @@ directory=Directory
 save.all=Save all
 
 authz.karma.needed=You need to be authenticated for this action or have more privileges.
+error.500=An error has happened you must contact the administrator to check the logs.
 
 administration.repositories=Repositories Administration
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
index 79dc190bc..ae2ce0582 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
@@ -35,6 +35,12 @@ function() {
         removeMediumSpinnerImg("#main-content");
         clearUserMessages();
         displayErrorMessage($.i18n.prop('authz.karma.needed'));
+      },
+      500: function(){
+        removeSmallSpinnerImg();
+        removeMediumSpinnerImg("#main-content");
+        clearUserMessages();
+        displayErrorMessage($.i18n.prop('error.500'));
       }
     }
   });