Removed try catch blocks and used throws