Change select to non-exception throwing