- [ ] Same TypeError protection needed here.