diff --git a/shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java b/shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java
index <HASH>..<HASH> 100644
--- a/shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java
+++ b/shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java
@@ -679,11 +679,11 @@ public class ShellImpl implements Shell
       try
       {
          reader.removeCompleter(this.completer);
-         reader.addCompleter(tempCompleter);
+         if (tempCompleter!=null) { reader.addCompleter(tempCompleter); }
          reader.setHistoryEnabled(false);
          reader.setPrompt(message);
          String line = readLine();
-         reader.removeCompleter(tempCompleter);
+         if (tempCompleter!=null) { reader.removeCompleter(tempCompleter); }
          reader.addCompleter(this.completer);
          reader.setHistoryEnabled(true);
          reader.setPrompt("");
fixed NPE when using basic completion (such as the one use for 'install' for facet name)