2005/01/19 23:13:26 jbu 1.2.24.1: #i37468# reduced liklyhood of crashing after main with extra checks