fixup: remove comments that turned out not to be true
fixup: avoid null pointer dereference