Fix crash at startup with -W options.
5 files changed