code style improve
fix watch exception