Do the async loading slightly differently.
Fix a potential NPE in CommandSpell