Merge "Convert fatal aborts to error returns"