diff --git a/cms-server/src/main/java/com/condation/cms/CMSServer.java b/cms-server/src/main/java/com/condation/cms/CMSServer.java
index d71991b91..34d0e8a73 100644
--- a/cms-server/src/main/java/com/condation/cms/CMSServer.java
+++ b/cms-server/src/main/java/com/condation/cms/CMSServer.java
@@ -23,11 +23,8 @@
 
 
 
-import com.condation.cms.api.Constants;
-import com.condation.cms.api.utils.ServerUtil;
-
+import com.condation.cms.cli.tools.CLIServerUtils;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.util.Properties;
 import lombok.extern.slf4j.Slf4j;
 import org.semver4j.Semver;
@@ -40,18 +37,11 @@
 public class CMSServer {
 
 	public static boolean isRunning () {
-		var pidFile = ServerUtil.getPath(Constants.PID_FILE);
-		if (!Files.exists(pidFile)) {
-			return false;
-		}
-		try {
-			var pid = Files.readString(pidFile);
-			
-			return ProcessHandle.of(Long.parseLong(pid)).isPresent();
-		} catch (IOException ex) {
-			log.error("", ex);
-		}
-		return false;
+        try {
+            return CLIServerUtils.getCMSProcess().isPresent();
+        } catch (IOException ioe) {
+            throw new RuntimeException(ioe);
+        }
 	}
 	
 	public static Semver getVersion () {
diff --git a/cms-server/src/main/java/com/condation/cms/cli/commands/host/ReloadHost.java b/cms-server/src/main/java/com/condation/cms/cli/commands/host/ReloadHost.java
index 8cf691110..b1998e2ba 100644
--- a/cms-server/src/main/java/com/condation/cms/cli/commands/host/ReloadHost.java
+++ b/cms-server/src/main/java/com/condation/cms/cli/commands/host/ReloadHost.java
@@ -26,6 +26,7 @@
 import com.condation.cms.api.Constants;
 import com.condation.cms.api.ServerProperties;
 import com.condation.cms.api.utils.ServerUtil;
+import com.condation.cms.cli.tools.CLIServerUtils;
 import com.condation.cms.core.configuration.ConfigurationFactory;
 import com.condation.cms.core.configuration.properties.ExtendedServerProperties;
 import com.condation.cms.ipc.Command;
@@ -84,12 +85,7 @@ public void run() {
 	}
 	
 	private static Optional<ProcessHandle> getCMSProcess () throws Exception {
-		var pidFile = ServerUtil.getPath(Constants.PID_FILE);
-		if (!Files.exists(pidFile)) {
-			return Optional.empty();
-		}
-		var pid = Files.readString(pidFile);
-		return ProcessHandle.of(Long.parseLong(pid.trim()));
+		return CLIServerUtils.getCMSProcess();
 	}
 
 	
diff --git a/cms-server/src/main/java/com/condation/cms/cli/commands/repo/Checkout.java b/cms-server/src/main/java/com/condation/cms/cli/commands/repo/Checkout.java
index bbe20248b..ce1077345 100644
--- a/cms-server/src/main/java/com/condation/cms/cli/commands/repo/Checkout.java
+++ b/cms-server/src/main/java/com/condation/cms/cli/commands/repo/Checkout.java
@@ -26,6 +26,7 @@
 import com.condation.cms.api.Constants;
 import com.condation.cms.api.ServerProperties;
 import com.condation.cms.api.utils.ServerUtil;
+import com.condation.cms.cli.tools.CLIServerUtils;
 import com.condation.cms.core.configuration.ConfigurationFactory;
 import com.condation.cms.core.configuration.properties.ExtendedServerProperties;
 import com.condation.cms.ipc.Command;
@@ -84,12 +85,7 @@ public void run() {
 	}
 	
 	private static Optional<ProcessHandle> getCMSProcess () throws Exception {
-		var pidFile = ServerUtil.getPath(Constants.PID_FILE);
-		if (!Files.exists(pidFile)) {
-			return Optional.empty();
-		}
-		var pid = Files.readString(pidFile);
-		return ProcessHandle.of(Long.parseLong(pid.trim()));
+		return CLIServerUtils.getCMSProcess();
 	}