* commit '7919ea98668abe3782f00f78cc48fc1ed011c49e': Crash on non-eng builds due to lacking null check.