Fixed NPE with function commands
Merge branch 'master' of https://github.com/UnacceptableUse/UnacceptableBOT2.git