try to handle pedantic cases a little better
Authored by: rob_d_clark 2008-06-15
Parent: [r2020]
Child: [r2022]