Added some checking to ensure blank string "choices" are ignored.