diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index 0cdd430..3fb4d4b 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 24 11:52:42 UTC 2014 - dmueller@suse.com
+
+- ignore stop errors in %preun 
+
 -------------------------------------------------------------------
 Sun Sep 14 17:18:01 UTC 2014 - tbechtold@suse.com
 
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index d008ea4..294069c 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -184,7 +184,6 @@ getent passwd rabbitmq >/dev/null || useradd -r -g rabbitmq \
 %if 0%{?have_systemd}
 %service_add_pre %{name}.service
 %endif
-exit 0
 
 %post
 %if 0%{?have_systemd}
@@ -198,7 +197,7 @@ systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf
 %if 0%{?have_systemd}
 %service_del_preun %{name}.service
 %else
-%stop_on_removal rabbitmq-server
+%stop_on_removal rabbitmq-server || :
 %endif
 
 %postun