diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties
index 8ea66e5e002..6f051e9654b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2007 IBM Corporation and others.
+# Copyright (c) 2006, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
 # Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
 # 
 # Contributors:
-# {Name} (company) - description of contribution.
+# Martin Oberhuber (Wind River) - [214141] Avoid NPE if missing SYST command
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_NONE
@@ -36,3 +36,4 @@ FTPParser.WinNT=WinNT
 FTPParser.OS2=OS2
 FTPParser.OS400=OS400
 FTPParser.VMS=VMS
+FTPParser.UNIXDefault=UNIX Default
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
index d32a5305f9f..128a3c3cdaf 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
@@ -20,6 +20,7 @@ Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to
 Javier Montalvo Orus (Symbian) - improved autodetection of FTPListingParser
 Martin Oberhuber (Wind River) - [198692] Use FTP LIST -a to list UNIX hidden files
 Javier Montalvo Orus (Symbian) - [225821] [ftp] opening "/home" fails on OS/400 IFS
+Martin Oberhuber (Wind River) - [214141] Avoid NPE if missing SYST command
 -->
 <?eclipse version="3.1"?>
 <plugin>
@@ -97,6 +98,15 @@ Javier Montalvo Orus (Symbian) - [225821] [ftp] opening "/home" fails on OS/400
              label="%FTPParser.VMS"
              priority="100">
       </parser>
+      <!-- Bug 214141: Default parser if nothing matches is Unix -->
+      <parser
+            class="org.apache.commons.net.ftp.parser.UnixFTPEntryParser"
+            id="org.eclipse.rse.ftp.parser.UnixDefault"
+            label="%FTPParser.UNIXDefault"
+            listCommandModifiers="-a"
+            priority="10000"
+            systemTypeRegex=".*">
+      </parser>
    </extension>
  
 </plugin>