Updates to Error Handling