@@ -1342,7 +1342,7 @@ function screen_stop_service {

     if is_service_enabled $service; then

         # Clean up the screen window

-        screen -S $SCREEN_NAME -p $service -X kill

+        screen -S $SCREEN_NAME -p $service -X kill || true

     fi

 }

@@ -42,7 +42,7 @@ function neutron_agent_lbaas_configure_agent {

 function neutron_lbaas_stop {

     pids=$(ps aux | awk '/haproxy/ { print $2 }')

-    [ ! -z "$pids" ] && sudo kill $pids

+    [ ! -z "$pids" ] && sudo kill $pids || true

 }

 # Restore xtrace

@@ -772,7 +772,7 @@ function stop_swift {

         stop_process s-${type}

     done

     # Blast out any stragglers

-    pkill -f swift-

+    pkill -f swift- || true

 }

 function swift_configure_tempurls {