--- /usr/portage/mail-filter/amavisd-new/files/amavisd.initd	2012-08-24 20:31:18.000000000 +0200
+++ /etc/init.d/amavisd	2014-04-11 01:08:30.215000000 +0200
@@ -9,6 +9,8 @@
 prog="/usr/sbin/amavisd"
 progname="amavisd-new"
 
+PIDFILE="/run/amavisd/amavisd.pid"
+
 depend() {
 	need net
 	use logger antivirus snmpd
@@ -22,6 +24,11 @@
 }
 
 stop() {
+	if [[ ! -e $PIDFILE ]] ; then
+		ewarn "Amavisd crashed or was terminated!"
+		return 0
+	fi
+
 	ebegin "Stopping ${progname}"
 	"${prog}" stop 1>/dev/null
 	eend $?