DEV: Add exception throwing