Added explicit exception
Fixed Test
Fixed typo
Added explicit Exception