1 files changed, 7 insertions, 2 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
index 485a7a1b341..297f1b23413 100644
--- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
@@ -284,8 +284,13 @@ public final class JRubyFacade {
     return getContainer().getComponent(ServerKeyGenerator.class).generate(organization, ipAddress);
   }
 
-  public Connection getConnection() throws SQLException {
-    return getContainer().getComponent(DatabaseConnector.class).getConnection();
+  public Connection getConnection() {
+    try {
+      return getContainer().getComponent(DatabaseConnector.class).getConnection();
+    } catch (Exception e) {
+      /* activerecord does not correctly manage exceptions when connection can not be opened. */
+      return null;
+    }
   }
 
   public Object getCoreComponentByClassname(String className) {