Fix ExceptionSafeModel