CBD-1366: Report errors and abort

Change-Id: I208d037ec90f0644dde73617ea6fbb3b0558f658