STORAGEMODEL-271: the exception handler was too inner