diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServletApplication.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServletApplication.java
index 7e415cc7f6..97bf564be9 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServletApplication.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServletApplication.java
@@ -198,6 +198,7 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
         }
     }
 
+    @NotNull
     @Override
     public Object start(IApplicationContext context) {
         initializeApplicationServices();
@@ -210,8 +211,9 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
             startServer();
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            return EXIT_ERROR_UNSPECIFIED;
         }
-        return null;
+        return EXIT_OK;
     }
 
     protected abstract void startServer() throws DBException;
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java
index d1ff7817fb..df995bfcd5 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java
@@ -98,4 +98,5 @@ public class CBConstants {
 
     public static final String BIND_SESSION_ENABLE = "enable";
     public static final String BIND_SESSION_DISABLE = "disable";
+    public static final String DEFAULT_CLOUD_PROJECT_NAME = "GlobalConfiguration";
 }
diff --git a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java
index 62be954fbd..f60cfa5109 100644
--- a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java
@@ -505,9 +505,10 @@ public abstract class CBApplication<T extends CBServerConfig>
         return "";
     }
 
+    @Nullable
     @Override
     public String getDefaultProjectName() {
-        return "GlobalConfiguration";
+        return CBConstants.DEFAULT_CLOUD_PROJECT_NAME;
     }
 
     public boolean isDevelMode() {