commit attempts to fix null deref