change action && add exception
change action && add exception