diff --git a/core-java-modules/core-java-console/src/main/java/com/baeldung/consoleout/ConsoleAndOut.java b/core-java-modules/core-java-console/src/main/java/com/baeldung/consoleout/ConsoleAndOut.java
index 99f185d539..5a327dbe62 100644
--- a/core-java-modules/core-java-console/src/main/java/com/baeldung/consoleout/ConsoleAndOut.java
+++ b/core-java-modules/core-java-console/src/main/java/com/baeldung/consoleout/ConsoleAndOut.java
@@ -5,11 +5,9 @@ import java.io.Console;
 public class ConsoleAndOut {
     public static void main(String[] args) {
         Console console = System.console();
-        System.out.println(console);
+        console.writer().print(console);
         
-        if (console != null) {
-            char[] password = console.readPassword("Enter password:");
-            console.printf(String.valueOf(password));
-        }
+        char[] password = console.readPassword("Enter password:");
+        console.printf(String.valueOf(password));
     }
 }