Error Handling Improvements