Bug 1032906: Fix generic error handling in Openshift agent