Added InvalidCommandException, changed around other exceptions.