1 files changed, 5 insertions, 4 deletions
diff --git a/src/jline/src/main/java/scala/tools/jline/console/completer/CandidateListCompletionHandler.java b/src/jline/src/main/java/scala/tools/jline/console/completer/CandidateListCompletionHandler.java
index 002f36b52e..fa5bfd2777 100644
--- a/src/jline/src/main/java/scala/tools/jline/console/completer/CandidateListCompletionHandler.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/CandidateListCompletionHandler.java
@@ -181,12 +181,13 @@ public class CandidateListCompletionHandler
         private static final
         ResourceBundle
             bundle =
-            ResourceBundle.getBundle(CandidateListCompletionHandler.class.getName(),
-                                     Locale.getDefault(),
-                                     CandidateListCompletionHandler.class.getClassLoader());
+            ResourceBundle.getBundle(CandidateListCompletionHandler.class.getName(), Locale.getDefault());
 
         public String format(final Object... args) {
-            return String.format(bundle.getString(name()), args);
+            if (bundle == null)
+                return "";
+            else
+                return String.format(bundle.getString(name()), args);
         }
     }
 }