Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/ConfigurationHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/ConfigurationHandler.java	(revision 1373)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/ConfigurationHandler.java	(revision 1374)
@@ -55,6 +55,6 @@
 	    defaultProperties.load(new BufferedInputStream(ConfigurationHandler.class.getResourceAsStream("default.properties")));
 	} catch (IOException e) {
-	    logger.error("Error while loading the default properties: " + e.getMessage(), e);
-	    throw new RuntimeException("Can't load default properties, because: "+ e.getMessage(), e);
+	    logger.error("Error while loading the default properties", e);
+	    throw new RuntimeException("Can't load default properties", e);
 	}
 	baseDir = defaultProperties.getProperty("fckeditor.basedir");
@@ -63,5 +63,5 @@
 	fckEditorHeight = defaultProperties.getProperty("fckeditor.height");
 	fckEditorToolbarSet = defaultProperties.getProperty("fckeditor.toolbarset");
-	logger.info("Default properties loaded and initialized successfull.");
+	logger.info("Default properties loaded and initialized successfully");
     }
 
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 1373)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java	(revision 1374)
@@ -265,6 +265,6 @@
 	    // create config html
 	    String configStr = oConfig.getUrlParams();
-	    if (!configStr.equals(""))
-		configStr = configStr.substring(1);
+	    if (Utils.isNotEmpty(configStr))
+		//configStr = configStr.substring(1);
 	    strEditor.append(createInputForVariable(null, instanceName.concat("___Config"), configStr));
 
@@ -272,7 +272,7 @@
 	    // TODO eventuell mit neuer Pfadstruktur untersuchen
 	    String sLink = basePath + "editor/fckeditor.html?InstanceName=" + instanceName;
-	    if (!toolbarSet.equals(""))
+	    if (Utils.isNotEmpty(toolbarSet))
 		sLink += "&Toolbar=" + toolbarSet;
-	    XHtmlTagTool iframeTag = new XHtmlTagTool("iframe", "");
+	    XHtmlTagTool iframeTag = new XHtmlTagTool("iframe");
 	    iframeTag.addAttribute("id", instanceName.concat("___Frame"));
 	    iframeTag.addAttribute("src", sLink);
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfigurations.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfigurations.java	(revision 1373)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfigurations.java	(revision 1374)
@@ -25,6 +25,10 @@
 import java.net.URLEncoder;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
+
+import net.fckeditor.tool.Utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -35,5 +39,8 @@
  * @version $Id$
  */
-public class FCKeditorConfigurations extends HashMap {
+public class FCKeditorConfigurations extends HashMap<String, String> {
+
+	private static final long serialVersionUID = -4831190504944866644L;
+	private final Logger logger = LoggerFactory.getLogger(FCKeditorConfigurations.class);
 
 	/**
@@ -51,19 +58,21 @@
 	 */
 	public String getUrlParams() {
-		StringBuffer osParams = new StringBuffer();
+		StringBuilder osParams = new StringBuilder();
 		try {
-			for (Iterator i = this.entrySet().iterator(); i.hasNext();) {
-				Map.Entry entry = (Map.Entry) i.next();
-				if (entry.getValue() != null) {
+			for (Map.Entry<String, String> entry : this.entrySet()) {
+				if (Utils.isNotEmpty(entry.getValue())) {
 					osParams.append("&");
-					osParams.append(URLEncoder.encode(
-							entry.getKey().toString(), "UTF-8"));
+					osParams.append(URLEncoder.encode(entry.getKey(),"UTF-8"));
 					osParams.append("=");
-					osParams.append(URLEncoder.encode(entry.getValue()
-							.toString(), "UTF-8"));
+					osParams.append(URLEncoder.encode(entry.getValue(),"UTF-8"));
 				}
 			}
+			
 		} catch (UnsupportedEncodingException e) {
+			logger.warn("Configuration parameters could not be encoded", e);
 		}
+		
+		if (osParams.length() > 0)
+			osParams.deleteCharAt(0);
 		return osParams.toString();
 	}
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/XHtmlTagTool.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/XHtmlTagTool.java	(revision 1373)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/XHtmlTagTool.java	(revision 1374)
@@ -83,5 +83,5 @@
 	
 	// close the tag
-	if (value != null) {
+	if (Utils.isNotEmpty(value)) {
 	    tag.append(">").append(value).append("</").append(name).append('>');
 	} else