Bug 956552: Fix error handling in stop action
Merge pull request #2298 from ironcladlou/bz/956552

Merged by openshift-bot