diff --git a/DBRepair.sh b/DBRepair.sh
index e7c68d9..d07fd0e 100755
--- a/DBRepair.sh
+++ b/DBRepair.sh
@@ -486,6 +486,14 @@ if ! HostConfig; then
   exit 1
 fi
 
+# Is PMS already running?
+if $PIDOF 'Plex Media Server' > /dev/null ; then
+  Output "Plex Media Server is currently running, cannot continue."
+  Output "Please stop Plex Media Server and restart this utility."
+  WriteLog "PMS running. Could not continue."
+  exit 1
+fi
+
 echo " "
 # echo Detected Host:  $HostType
 WriteLog "============================================================"
@@ -530,21 +538,13 @@ cd "$DBDIR"
 while true
 do
 
-  # Is PMS already running?
-  if [ -f "$PID_FILE" ] && [ "$($PIDOF 'Plex Media Server')" != "" ] ; then
-    Output "Plex Media Server is currently running, cannot continue."
-    Output "Please stop Plex Media Server and restart this utility."
-    WriteLog "PMS running. Could not continue."
-    exit 1
-  fi
-
   # Main menu loop
   Choice=0; Exit=0
   while [ $Choice -eq 0 ]
   do
     echo " "
     echo " "
-    echo "      (DEVELOPMENT) Plex Media Server Database Repair Utility ($HostType)"
+    echo "      Plex Media Server Database Repair Utility ($HostType)"
     echo " "
     echo "Select"
     echo " "
@@ -585,6 +585,16 @@ do
     TimeStamp="$(date "+%Y-%m-%d_%H.%M.%S")"
   done
 
+  # Don't get caught; Is PMS already running?
+  if $PIDOF 'Plex Media Server' > /dev/null ; then
+    if [ $Choice -lt 8 ]; then
+      Output "Plex Media Server is currently running, cannot continue."
+      Output "Please stop Plex Media Server and restart this utility."
+      WriteLog "PMS running. Could not continue."
+      continue
+    fi
+  fi
+
   # Spacing for legibility
   echo ' '
 
diff --git a/README.md b/README.md
index e189642..c5005f8 100644
--- a/README.md
+++ b/README.md
@@ -58,14 +58,14 @@ It is a simple menu-driven utility with a command line backend.
     Linux (wkstn/svr)  | N/A                 |  Anywhere
     Apple              | Downloads           |  ~/Downloads
 ```
-###    To install & launch:
+###    To install & launch on general Linux or most Linux NAS platforms:
         1. Place the tar/zip/sh file in the appropriate directory
         2. Open a command line session (usually SSH)
         3. Elevate privilege level to root
         4. Extract the utility from the tar or zip file
         4. Invoke the utility
 
-    (Synology DSM 6 used as example)
+####    (Synology DSM 6 used as example)
 ```
         cd /volume1/Plex
         sudo bash
@@ -74,10 +74,17 @@ It is a simple menu-driven utility with a command line backend.
         ./DBRepair.sh
 ```
 
-###    To launch in a container:
+###    To launch in a Docker container:
 ```
         sudo docker exec -it plex /bin/bash
-        /plex_service.sh -d   # Stop Plex
+
+        # Stop Plex when using official Plex,inc image
+        /plex_service.sh -d
+--or--
+        # Stop Plex when using Linuxserver.io Plex image
+        s6-svc -d /var/run/service/svc-plex
+
+
         tar xf DBRepair.tar
         chmod +x DBRepair.sh
         ./DBRepair.sh