Oh, freak. I changed this line and left out an if. I'll rebase-fix that.