Index: /trunk/JavaHelperLib/src/de/ugoe/cs/util/StringTools.java
===================================================================
--- /trunk/JavaHelperLib/src/de/ugoe/cs/util/StringTools.java	(revision 349)
+++ /trunk/JavaHelperLib/src/de/ugoe/cs/util/StringTools.java	(revision 350)
@@ -41,9 +41,12 @@
 	public static String xmlEntityReplacement(String str) {
 		String result = str;
-		result = result.replaceAll("&(?!(?:lt|gt|apos|quot|amp);)", "&");
-		result = result.replaceAll("<", "&lt;");
-		result = result.replaceAll(">", "&gt;");
-		result = result.replaceAll("'", "&apos;");
-		result = result.replaceAll("\"", "&quot;");
+		if (result != null && !"".equals(result)) {
+			result = result
+					.replaceAll("&(?!(?:lt|gt|apos|quot|amp);)", "&amp;");
+			result = result.replaceAll("<", "&lt;");
+			result = result.replaceAll(">", "&gt;");
+			result = result.replaceAll("'", "&apos;");
+			result = result.replaceAll("\"", "&quot;");
+		}
 		return result;
 	}