Fix more fatal errors (Bug #12290).
Tweak