follow up to !3
## description
in !3, to make Clippy happy, `expect` was replace with `unwrap_or_else`, but that suppresses the message of the underlying error, which is not great...
this MR reverts this part of !3 and allows `clippy::expect_fun_call`.
