Improve errors, added missing asset list