Yet another possible bugfix
I'm hoping these exceptions don't keep creeping up on me