--- a/jdk/src/java.desktop/share/classes/java/awt/TextField.java	Tue Dec 08 19:50:14 2015 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/TextField.java	Wed Dec 09 18:12:49 2015 +0300
@@ -309,6 +309,9 @@
      * @return      Returns text after replacing EOL characters.
      */
     private static String replaceEOL(String text) {
+        if (text == null) {
+            return text;
+        }
         String[] strEOLs = {System.lineSeparator(), "\n"};
         for (String eol : strEOLs) {
             if (text.contains(eol)) {