better null handling, less chatty logs