try/catch blocks added