Remove useless **else** clauses when not necessary.
Always raise the exception first.