Address pylint 2.3.x's no-else-raise warning

Description

Modern versions of pylint include a warning the no-else-raise warning (see pylint's changelog)

Addressing this warning improves code quality.