Improvements on Error Handling