Revised exception usage