I am not sure that these function need a "|| die".
Can you double check?