Updated to remove unnecessary comments and add null check
Authored by: pfaat_matt 2006-09-29
Parent: [r711]
Child: [r713]
