removed old exception catching which is not used anymore