Revert "I've seen this mysteriously crash with a null. While that's not good, it shouldn't be making things bomb out."

This reverts commit d7380429448f4d0632deb425102fda7c52a7d07c.