Watch out for NULL deref, recent regression