Add Exception Handling