No need for nil checking in commit #7597f0d