Removed exception handling