diff --git a/src/netbeans.c b/src/netbeans.c
index f39111dc9b..6f92b3c390 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -2773,6 +2773,16 @@ ex_nbkey(eap)
 ex_nbstart(eap)
     exarg_T	*eap;
 {
+#ifdef FEAT_GUI
+# if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
+                && !defined(FEAT_GUI_W32)
+    if (gui.in_use)
+    {
+        EMSG(_("E838: netbeans is not supported with this GUI"));
+        return;
+    }
+# endif
+#endif
     netbeans_open((char *)eap->arg, FALSE);
 }
 
diff --git a/src/version.c b/src/version.c
index 2154b3c132..38a081352c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    19,
 /**/
     18,
 /**/