Revert "fixup."

This reverts commit 10450832c35a255b60eb3e740bfe5181ff0f3698.
Fixups: fix comment, assert non-null result and use LOG_ERR severity for errors.