This if/else block should be redundant now also as we will hit exception on line 46?