diff --git a/Dockerfile b/Dockerfile
index 7eea2e7..884abde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,10 +4,10 @@ FROM ${BASE_IMAGE}:${ALPINE_VERSION}
 MAINTAINER "f <f@sutty.nl>"
 
 RUN apk add --no-cache opendkim mini-sendmail
+
 COPY ./monit.conf /etc/monit.d/opendkim.conf
 COPY ./opendkimd.sh /usr/local/bin/opendkimd
 COPY ./sendmail.sh /usr/bin/sendmail
-RUN install -dm 2750 -o opendkim -g opendkim /run/opendkim
 
 EXPOSE 8891
 VOLUME /etc/opendkim
diff --git a/opendkimd.sh b/opendkimd.sh
index f106878..b8e71bf 100755
--- a/opendkimd.sh
+++ b/opendkimd.sh
@@ -3,8 +3,13 @@
 pid=/tmp/opendkim.pid
 
 case $1 in
-  stop) cat ${pid} | xargs kill ;;
+  stop)
+    test -f ${pid} && cat ${pid} | xargs kill
+    ;;
   *)
+    install -dm 2750 -o opendkim -g opendkim /run/opendkim
     chown -R opendkim:opendkim /etc/opendkim
-    /usr/sbin/opendkim ;;
+
+    /usr/sbin/opendkim
+    ;;
 esac