TAVSERV-338: Change the exception type. Refactor to clarify common code.