Fix error reporting for inaccessible clusters
Merge branch 'error-reporting' into heartbeat