Updated lock after exception_notification