Updated to fix null pointer exception which occurs during close alignment.
Authored by: pfaat_matt 2006-05-31
Parent: [r469]
Child: [r471]
