Fixed up exit early for options