removing exception throwing