Update

Update exception handling