Add exit interception