fix domain not found handling