The previous commit didn't completely fixed the case where it would crash. This will, since we're not enumerating anymore.