fixing style, fixed try/catch,