Got rid of an unreachable exception