Fix typo in if statement, better option handling