Fixed a few other NPE's that should have been fixed with the previous commit
Also fixed a recursion error with commandPrefix for usage display