Improve inventory generator loading (now recursive) and improve error handling