Improved Exception Handling