Fixed an issue where not selecting an option would throw null pointer
exception - it now returns null instead. (is this a wise move?)