diff --git a/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java b/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
index 14b7c80bbde5d802578417ce4f6cce06550635dc..9a21dc9ddfe895962c22b1d65a4d94e5dfbd3e79 100644
--- a/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
+++ b/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,8 +148,12 @@ public class TextCallbackHandler implements CallbackHandler {
 
     /* Reads a line of input */
     private String readLine() throws IOException {
-        return new BufferedReader
+        String result = new BufferedReader
             (new InputStreamReader(System.in)).readLine();
+        if (result == null) {
+            throw new IOException("Cannot read from System.in");
+        }
+        return result;
     }
 
     private void doConfirmation(ConfirmationCallback confirmation)
diff --git a/test/com/sun/security/auth/callback/TextCallbackHandler/NPE.java b/test/com/sun/security/auth/callback/TextCallbackHandler/NPE.java
new file mode 100644
index 0000000000000000000000000000000000000000..fc92a6080e08fa39b961b4fb4695daf8c3743753
--- /dev/null
+++ b/test/com/sun/security/auth/callback/TextCallbackHandler/NPE.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6844887
+ * @summary NPE in TextCallbackHandler
+ */
+
+import com.sun.security.auth.callback.TextCallbackHandler;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.security.auth.callback.*;
+
+public class NPE {
+    public static void main(String args[]) throws Exception {
+        System.setIn(new ByteArrayInputStream(new byte[0]));
+
+        try {
+            new TextCallbackHandler().handle(new Callback[]  {
+                new NameCallback("Name: ") }
+            );
+        } catch (IOException ioe) {
+            // This is OK
+        }
+   }
+}