diff --git a/server/core/gateway.c b/server/core/gateway.c
index 777e35ddb..f25d2207f 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -207,7 +207,7 @@ static bool resolve_maxscale_conf_fname(
 
 static char* check_dir_access(char* dirname,bool,bool);
 static int set_user();
-
+bool pid_file_exists();
 /** SSL multi-threading functions and structures */
 
 static SPINLOCK* ssl_locks;
@@ -1816,6 +1816,13 @@ int main(int argc, char **argv)
                 "MaxScale is running in process  %i",
                 getpid())));
 
+	/** Check if a MaxScale process is already running */
+	if(pid_file_exists())
+	{
+	    rc = MAXSCALE_ALREADYRUNNING;
+	    goto return_main;
+	}
+
 	/* Write process pid into MaxScale pidfile */
 	write_pid_file();
 
@@ -2000,6 +2007,88 @@ static void unlink_pidfile(void)
 	}
 }
 
+/**
+ * Check if a PID file is already written and a MaxScale process is running.
+ * @return True if the file exists and MaxScale should exit
+ */
+bool pid_file_exists()
+{
+    char pathbuf[PATH_MAX+1];
+    char pidbuf[1024];
+    pid_t pid;
+    int fd = -1;
+    int b;
+
+    snprintf(pathbuf, PATH_MAX, "%s/maxscale.pid",piddir?piddir:default_piddir);
+
+    if(access(pathbuf,F_OK) != 0)
+	return false;
+
+    if(access(pathbuf,R_OK) == 0)
+    {
+	fd = open(pathbuf, O_RDONLY);
+	if(fd == -1)
+	{
+	    close(fd);
+	    char* logerr = "Error: Failed to open PID file.";
+	    print_log_n_stderr(true, true, logerr, logerr, errno);
+	    return true;
+	}
+
+	if((b = read(fd,pidbuf,1024)) == -1)
+	{
+	    close(fd);
+	    char* logerr = "Error: Failed to read from PID file.";
+	    print_log_n_stderr(true, true, logerr, logerr, errno);
+	    return true;
+	}
+	close(fd);
+
+	if(b == 0 )
+	{
+	    /** Empty file */
+	    char* logerr = "Error: PID file was empty.";
+	    print_log_n_stderr(true, true, logerr, logerr, errno);
+	    return true;
+	}
+
+	pidbuf[b < 1024? b:1023] = '\0';
+	pid = strtol(pidbuf,NULL,0);
+
+	if(pid == 0 )
+	{
+	    /** Bad PID */
+	    char* logerr = "Error: PID file contents not valid.";
+	    print_log_n_stderr(true, true, logerr, logerr, errno);
+	    return true;
+	}
+
+	if(kill(pid,0) == -1)
+	{
+	    if(errno == ESRCH)
+	    {
+		/** no such process, old PID file */
+		return false;
+	    }
+	}
+	else
+	{
+	    char* logerr = "Error: MaxScale is already running. Process id: %d";
+	    char logbuf[1024];
+	    sprintf(logbuf,logerr,pid);
+	    print_log_n_stderr(true, true, logbuf, logbuf, 0);
+	    return true;
+	}
+    }
+    else
+    {
+	char* logerr = "Error: Cannot open PID file, no read permissions.";
+	print_log_n_stderr(true, true, logerr, logerr, 0);
+	return true;
+    }
+    return true;
+}
+
 /** 
  * Write process pid into pidfile anc close it
  * Parameters:
diff --git a/server/include/maxscale.h b/server/include/maxscale.h
index 521c42dd9..b178c45a8 100644
--- a/server/include/maxscale.h
+++ b/server/include/maxscale.h
@@ -37,7 +37,7 @@
 #define MAXSCALE_BADCONFIG	1	/* Configuration fiel error */
 #define MAXSCALE_NOLIBRARY	2	/* No embedded library found */
 #define MAXSCALE_NOSERVICES	3	/* No servics are running */
-#define MAXSCALE_HOMELESS	4	/* No MaxScale Home */
+#define MAXSCALE_ALREADYRUNNING	4	/* MaxScale is already runing */
 #define MAXSCALE_BADARG		5	/* Bad command line argument */
 #define MAXSCALE_INTERNALERROR	6	/* Internal error, see error log */
 #endif