--- network-manager.postinst.orig	2007-09-05 15:10:53.000000000 -0700
+++ network-manager.postinst	2007-09-05 15:07:30.000000000 -0700
@@ -1,20 +1,24 @@
 #!/bin/sh
 
-set -e
+set -eu
 
 case "$1" in
     	configure)
 		if [ -x "/etc/init.d/dbus" ]; then
-			invoke-rc.d dbus force-reload || true
-		fi
-	
-		if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then
-			/etc/dbus-1/event.d/25NetworkManager restart
+                        RESULT=0
+			invoke-rc.d --disclose-deny dbus force-reload || RESULT=$?
+
+                    if [ ${RESULT} -eq 0 ]; then
+                        # Only run dbus actions if invoke-rc.d returned 0
+                        if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then
+                                /etc/dbus-1/event.d/25NetworkManager restart
+                        fi
+                
+                        if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then
+                                /etc/dbus-1/event.d/26NetworkManagerDispatcher restart
+                        fi			 
+                    fi
 		fi
-	
-		if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then
-			/etc/dbus-1/event.d/26NetworkManagerDispatcher restart
-		fi			 
     	;;
 esac