[#63730868] some logic for handling errors