Fixed crashing on non whitelisted item (hopefully)
Merge branch 'master' of github.com:tfermm/Fermis-cc