diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
index 444a3f90fb..4fb5dfdb64 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -207,6 +207,9 @@ public class CBApplication extends BaseApplicationImpl {
}
private void initializeDatabase() throws DBException {
+ if (databaseConfiguration == null) {
+ throw new DBException("Database configuration missing");
+ }
database = new CBDatabase(this, databaseConfiguration);
securityController = new CBSecurityController(database);
diff --git a/server/product/web-server/CloudbeaverServer.product.launch b/server/product/web-server/CloudbeaverServer.product.launch
index c68afd928c..6d892ca98f 100644
--- a/server/product/web-server/CloudbeaverServer.product.launch
+++ b/server/product/web-server/CloudbeaverServer.product.launch
@@ -31,7 +31,7 @@
-
+