- added an else block
 - removed useless exceptions