Updated to handle cancel button condition.
Authored by: pfaat_matt 2007-04-03
Parent: [r876]
Child: [r878]