Make Option parsing safer.