I put ~100 hours in and that was my biggest gripe. There were a few other minor things I missed, but none were as annoying as that. I never thought they'd lock a companion behind a skill check you could just totally fail.

Just save often, and maybe check the wiki after you're done with areas so you avoid spoilers.