diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java index f111acf6e..332ed62d3 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java @@ -777,7 +777,7 @@ public class LocalizedTextUtil { } private static void reloadBundles() { - reloadBundles(ActionContext.getContext().getContextMap()); + reloadBundles(ActionContext.getContext() != null ? ActionContext.getContext().getContextMap() : null); } private static void reloadBundles(Map context) {