nit comments on style:
1. 2-space indent
2. Use below try-catch style, I know existing code use current style, I'd prefer to you change together.
```
try {
} catch {
}
```