avoid i_push_errorf() and i_fatal() in a few more places