Better error handling when provisioning or unprovisioning fails.
Resolved conflicts