diff --git a/README.md b/README.md
index 84c7af2..74cb881 100644
--- a/README.md
+++ b/README.md
@@ -98,15 +98,15 @@ The end users in your organization / lab can visit the public pages of you LabCA
 
 After installing sometimes the application is not starting up properly and it can be quite hard to figure out why. Some log files to check in case of issues are:
 * /home/labca/nginx_data/ssl/acme_tiny.log
-* /home/labca/logs/commander.log
-* cd /home/labca/boulder; docker-compose logs labca
+* cd /home/labca/boulder; docker-compose exec control cat /logs/commander.log (if it exists)
+* cd /home/labca/boulder; docker-compose logs control
 * cd /home/labca/boulder; docker-compose logs boulder
-* /var/log/labca.err
-* possibly /var/log/nginx/error.log
+* cd /home/labca/boulder; docker-compose logs labca
+* possibly cd /home/labca/boulder; docker-compose logs nginx
 
 ### Common error messages
 
-If you get "**No valid IP addresses found for <hostname>**" in /home/labca/nginx_data/ssl/acme_tiny.log, solve it by entering the hostname in your local DNS. Same for "**Could not resolve host: <hostname>**" in /var/log/labca.err.
+If you get "**No valid IP addresses found for <hostname>**" in /home/labca/nginx_data/ssl/acme_tiny.log, solve it by entering the hostname in your local DNS. Same for "**Could not resolve host: <hostname>**" in one of those docker-compose logs.
 
 When issuing a certificate, LabCA/boulder checks for CAA (Certification Authority Authorization) records in DNS, which specify what CAs are allowed to issue certificates for the domain. If you get an error like "**SERVFAIL looking up CAA for internal**" or "**CAA record for ca01.foo.internal prevents issuance**", you can try to add something like this to your DNS domain:
 ```
diff --git a/commander b/commander
index f62eab9..e5ace1f 100755
--- a/commander
+++ b/commander
@@ -88,6 +88,10 @@ case $txt in
     [ -f $LOGFILE ] && tail -200 $LOGFILE || /bin/true
     exit 0
     ;;
+"log-control-notail")
+    cd /boulder
+    docker-compose logs --no-color --tail=50 control
+    ;;
 "log-cron")
     [ -f /logs/cron.log ] && tail -n200 -f /logs/cron.log || /bin/true
     exit 0
@@ -119,10 +123,6 @@ case $txt in
     cd /boulder
     docker-compose logs --no-color --tail=50 labca
     ;;
-"log-labca-err")
-    [ -f /var/log/labca.err ] && tail -200 /var/log/labca.err || /bin/true
-    exit 0
-    ;;
 "log-web")
     cd /boulder
     docker-compose logs -f --no-color --tail=50 nginx
diff --git a/gui/main.go b/gui/main.go
index fdb40e8..ae5582b 100644
--- a/gui/main.go
+++ b/gui/main.go
@@ -236,19 +236,19 @@ func errorHandler(w http.ResponseWriter, r *http.Request, err error, status int)
 			}
 			data = getLog(w, r, "commander")
 			if data != "" {
-				FileErrors = append(FileErrors, map[string]interface{}{"FileName": "/home/labca/logs/commander.log", "Content": data})
+				FileErrors = append(FileErrors, map[string]interface{}{"FileName": "(control)/logs/commander.log", "Content": data})
 			}
-			data = getLog(w, r, "labca-notail")
+			data = getLog(w, r, "control-notail")
 			if data != "" {
-				FileErrors = append(FileErrors, map[string]interface{}{"FileName": "docker-compose logs labca", "Content": data})
+				FileErrors = append(FileErrors, map[string]interface{}{"FileName": "docker-compose logs control", "Content": data})
 			}
 			data = getLog(w, r, "boulder-notail")
 			if data != "" {
 				FileErrors = append(FileErrors, map[string]interface{}{"FileName": "docker-compose logs boulder", "Content": data})
 			}
-			data = getLog(w, r, "labca-err")
+			data = getLog(w, r, "labca-notail")
 			if data != "" {
-				FileErrors = append(FileErrors, map[string]interface{}{"FileName": "/var/log/labca.err", "Content": data})
+				FileErrors = append(FileErrors, map[string]interface{}{"FileName": "docker-compose logs labca", "Content": data})
 			}
 
 			render(w, r, "error", map[string]interface{}{"Message": "Some unexpected error occurred!", "FileErrors": FileErrors})