--- a/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Fri Apr 28 19:03:56 2017 +0200
+++ b/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Tue May 09 16:05:42 2017 +0200
@@ -259,9 +259,17 @@
         if (ds.getNumActive() == ds.getMaxTotal()) {
             log.warn("Maximum number of database connections in pool in use!");
         }
-        Connection conn = ds.getConnection();
-        log.trace("Return connection with hash: " + conn.hashCode());
-        return conn;
+
+        try {
+            Connection conn = ds.getConnection();
+            log.trace("Return connection with hash: " + conn.hashCode());
+            return conn;
+        }
+        catch (SQLException sqle) {
+            throw new SQLException(
+                "Connecting to database " + ds.getUrl() + " failed",
+                sqle);
+        }
     }
 
     public void closeConnection(Connection conn) throws SQLException {