COMMON: update comments
COMMON: update try/catch