removed exception catching