1 diff --git a/runtime/autoload/remote/host.vim b/runtime/autoload/remote/host.vim
2 index 6266b312b..965fabf1e 100644
3 --- a/runtime/autoload/remote/host.vim
4 +++ b/runtime/autoload/remote/host.vim
5 @@ -71,7 +71,8 @@ function! remote#host#RegisterPlugin(host, path, specs) abort
8 if plugin.path == a:path
9 - throw 'Plugin "'.a:path.'" is already registered'
10 + " plugin already registered
15 diff --git a/runtime/plugin/rplugin.vim b/runtime/plugin/rplugin.vim
16 index 122d8d47f..83fbf8b57 100644
17 --- a/runtime/plugin/rplugin.vim
18 +++ b/runtime/plugin/rplugin.vim
19 @@ -54,6 +54,10 @@ function! s:GetManifest() abort
22 function! s:LoadRemotePlugins() abort
23 + if exists('$NVIM_SYSTEM_RPLUGIN_MANIFEST')
24 + let g:system_remote_plugins = fnamemodify($NVIM_SYSTEM_RPLUGIN_MANIFEST, ':p')
25 + execute 'source' fnameescape(g:system_remote_plugins)
27 let g:loaded_remote_plugins = s:GetManifest()
28 if filereadable(g:loaded_remote_plugins)
29 execute 'source' fnameescape(g:loaded_remote_plugins)