Some error handling updates