Better handling of missing itemstacks