- error handling fix