Fixed handle errors