docs: Fix mismatch return value, remove redundant error propagation, and additional fixes

docs: Fix mismatch return value, remove redundant error propagation, and additional fixes #5808