Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java	(revision 1475)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java	(revision 1476)
@@ -95,5 +95,5 @@
 	 *            unique name
 	 */
-	@Deprecated
+
 	public FCKeditor(final HttpServletRequest request, final String instanceName) {
 		this(request, instanceName, null, null, null, null);
@@ -186,4 +186,6 @@
 
 	private String escapeXml(String txt) {
+		if(Utils.isEmpty(txt))
+			return txt;
 		txt = txt.replaceAll("&", "&#38;");
 		txt = txt.replaceAll("<", "&#60;");
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp	(revision 1475)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp	(revision 1476)
@@ -1,60 +1,54 @@
-<%@ page language="java" import="net.fckeditor.*" %>
-<!--
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" import="net.fckeditor.*"%>
+<%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- * 
+ *
  * == BEGIN LICENSE ==
- * 
+ *
  * Licensed under the terms of any of the following licenses at your
  * choice:
- * 
+ *
  *  - GNU General Public License Version 2 or later (the "GPL")
  *    http://www.gnu.org/licenses/gpl.html
- * 
+ *
  *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
  *    http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  *  - Mozilla Public License Version 1.1 or later (the "MPL")
  *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
+ *
  * == END LICENSE ==
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
+--%>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>FCKeditor - JSP Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
 		<link href="../sample.css" rel="stylesheet" type="text/css" />
 		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	window.status = editorInstance.Description ;
-}
-
+			function FCKeditor_OnComplete(editorInstance) {
+				window.status = editorInstance.Description;
+			}
 		</script>
 	</head>
-<%
-FCKeditor oFCKeditor ;
-oFCKeditor = new FCKeditor( request, "EditorDefault" ) ;
-%>
+	<%
+		FCKeditor fckEditor = new FCKeditor(request, "EditorDefault");
+	%>
 	<body>
 		<h1>FCKeditor - JSP - Sample 1</h1>
-		<p>This sample displays a normal HTML form with an FCKeditor with full features enabled.</p>
+		<p>This sample displays a normal HTML form with an FCKeditor with
+		full features enabled.</p>
 		<p>Basic FCKeditor informations:</p>
-		<ul>
-			<li>Browser is compatible: <%out.print(oFCKeditor.isCompatibleBrowser());%></li>
-			<li>Connector is enabled: <%out.print(oFCKeditor.isConnectorEnabled());%>
-		</ul>
-		<hr>
+		<hr />
 		<form action="sampleposteddata.jsp" method="get" target="_blank">
-<%
-oFCKeditor.setValue( "This is some <strong>sample text</strong>. You are using <a href=\"http://www.fredck.com/fckeditor/\">FCKeditor</a>." );
-out.println( oFCKeditor.create() ) ;
-%>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
+		<%
+			fckEditor.setValue("This is some <strong>sample text</strong>. You are using <a href=\"http://www.fckeditor.net\">FCKeditor</a>.");
+			out.println(fckEditor);
+		%>
+		<br />
+		<input type="submit" value="Submit" /></form>
 	</body>
 </html>
