SEMISC-90: Sync with live.
SEMISC-90: Fixed exception.