Began handling the nil case