Changed InvalidCommandException to extend InvalidArgumentException