try-catch TODO comments added