Fixed null deref