Tighten up an internal LSR API that should check for NULL.