Error Handling and Fix