Improved handling of missing content/mod content