Remove more exception throwing