Now throwing exceptions correctly!