r23633: Fix a couple of crash bugs pointed out by Volker caused by an old