applied changes from 3bfdb24d5dd9a3e269aa694ebedc270630053210
through 17bcbc27490a107b719d992aeeeda076daf53257

Original commit message:
oscar: Avoid a few printf("%s", NULL)s

Thanks to clh and dustin.
Fixes #14295, #14297.