Fix goalie nil toi

This is solid, ready to merge.