fixed null pointer exception added a few fields
Authored by: dcaffrey 2006-07-01
Parent: [r497]
Child: [r499]
