diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 9b65628b..f6c67bc8 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -184,7 +184,7 @@ cp /usr/lib/qubes/serial.conf /etc/init/serial.conf
 # problems (http://wiki.qubes-os.org/trac/ticket/607)
 # /etc/pam.d/common-* are automatically (re)generated by authconfig, so its
 # modification will not be persistent -> must be done this way
-mv -f /%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so.disabled
+mv -f /%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so.disabled 2> /dev/null || :
 
 %post
 
@@ -557,10 +557,6 @@ done
 
 /bin/systemctl enable qubes-update-check.timer 2> /dev/null
 
-# Disable D-BUS activation of NetworkManager - in AppVm it causes problems (eg PackageKit timeouts)
-/bin/systemctl disable NetworkManager.service 2> /dev/null
-/bin/systemctl mask dbus-org.freedesktop.NetworkManager.service 2> /dev/null
-
 # Install overriden services only when original exists
 for srv in cups NetworkManager ntpd; do
     if [ -f /lib/systemd/system/$srv.service ]; then
@@ -610,7 +606,10 @@ rm -f /etc/systemd/system/getty.target.wants/getty@tty*.service
 /bin/systemctl enable ntpd.service 2> /dev/null
 # Disable original service to enable overriden one
 /bin/systemctl disable NetworkManager.service 2> /dev/null
+# Disable D-BUS activation of NetworkManager - in AppVm it causes problems (eg PackageKit timeouts)
+/bin/systemctl mask dbus-org.freedesktop.NetworkManager.service 2> /dev/null
 /bin/systemctl enable NetworkManager.service 2> /dev/null
+
 # Enable cups only when it is real SystemD service
 [ -e /lib/systemd/system/cups.service ] && /bin/systemctl enable cups.service 2> /dev/null