Removed exception catching