Improve Nonfatal Error Handling