Updated Exception Handling