Merge "Always throw a ConnectionException on error" into oc-dev