Now guards against a combo box having a value that is not present in the underlying colelction.
Authored by: keess 2015-04-09
Parent: [r2713]
Child: [r2715]
