Make sure `kwargs=None` is properly handled. Fixes #16945.

It will always be defined, and this 'unknown!?' default is just for the log message. The actual call will fail.