diff --git a/src/evalfunc.c b/src/evalfunc.c
index 4d73d40..d6fb03e 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2307,9 +2307,10 @@
     if (intidx < 0)
     {
 	name = get_user_func_name(xp, idx);
-	if (name != NULL && *name != NUL)
+	if (name != NULL)
 	{
-	    if (*name != '<' && STRNCMP("g:", xp->xp_pattern, 2) == 0)
+	    if (*name != NUL && *name != '<'
+				      && STRNCMP("g:", xp->xp_pattern, 2) == 0)
 		return cat_prefix_varname('g', name);
 	    return name;
 	}
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 5d91952..d04bb4c 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -650,7 +650,7 @@
 
 func Test_cmdline_complete_user_func()
   call feedkeys(":func Test_cmdline_complete_user\<Tab>\<Home>\"\<cr>", 'tx')
-  call assert_match('"func Test_cmdline_complete_user', @:)
+  call assert_match('"func Test_cmdline_complete_user_', @:)
   call feedkeys(":func s:ScriptL\<Tab>\<Home>\"\<cr>", 'tx')
   call assert_match('"func <SNR>\d\+_ScriptLocalFunction', @:)
 
@@ -662,6 +662,14 @@
   let Fx = { a ->  a }
   call feedkeys(":echo g:\<Tab>\<Home>\"\<cr>", 'tx')
   call assert_match('"echo g:[A-Z]', @:)
+
+  " existence of script-local dict function does not break user function name
+  " completion
+  function s:a_dict_func() dict
+  endfunction
+  call feedkeys(":call Test_cmdline_complete_user\<Tab>\<Home>\"\<cr>", 'tx')
+  call assert_match('"call Test_cmdline_complete_user_', @:)
+  delfunction s:a_dict_func
 endfunc
 
 func Test_cmdline_complete_user_names()
diff --git a/src/version.c b/src/version.c
index b47b1e3..2d890f8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3360,
+/**/
     3359,
 /**/
     3358,