[ ! ] Exception fixes