Undo 4151484ae7bca663f0b881fc77917b91448661fd and check for nil instead.