--- old/src/java.desktop/share/classes/java/awt/TextField.java	2015-12-09 14:27:59.946013000 +0530
+++ new/src/java.desktop/share/classes/java/awt/TextField.java	2015-12-09 14:27:59.738013000 +0530
@@ -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)) {