Re: Fix nullptr deref