Fix some calls to make the process works if there are no errors