Some error handling bug fixes