Bug 956552: Fix error handling in stop action