Fixed Error Handling.