Remove exception throwing