Removed two exception cases that can never be hit