Fixed typo and removed exception