admin,templates,core: Minor enhancements and error handling (#3607)

* fix 2 possible bugs

* handle unhandled errors

1 files changed, 1 insertions, 1 deletions

diff --git a/caddy.go b/caddy.go
index 0092641..000cd6f 100644
--- a/caddy.go
+++ b/caddy.go
@@ -471,7 +471,7 @@ func stopAndCleanup() error {
 	}
 	certmagic.CleanUpOwnLocks()
 	if pidfile != "" {
-		os.Remove(pidfile)
+		return os.Remove(pidfile)
 	}
 	return nil
 }