fleet/changes/issue-1286-improve-errors