Remove unreachable throw - replace with assert