Error handling fix (again)