add current panic support