diff --git a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
index ff34df6a5..cb92b8607 100644
--- a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
+++ b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
@@ -29,6 +29,7 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.StrutsException;
+import org.apache.struts2.util.ClassLoaderUtils;
 
 import com.opensymphony.xwork2.util.location.LocatableProperties;
 import com.opensymphony.xwork2.util.location.Location;
@@ -53,7 +54,7 @@ class PropertiesSettings extends Settings {
      */
     public PropertiesSettings(String name) {
         
-        URL settingsUrl = Thread.currentThread().getContextClassLoader().getResource(name + ".properties");
+        URL settingsUrl = ClassLoaderUtils.getResource(name + ".properties", getClass());
         
         if (settingsUrl == null) {
             LOG.debug(name + ".properties missing");
diff --git a/core/src/main/resources/template/simple/debug.ftl b/core/src/main/resources/template/simple/debug.ftl
index 19a3f35b3..ab59368a2 100644
--- a/core/src/main/resources/template/simple/debug.ftl
+++ b/core/src/main/resources/template/simple/debug.ftl
@@ -31,7 +31,7 @@
 
         <#assign renderRow=false>
         <#list stackObject.value.keySet() as propertyName>
-            <#if renderRow==true><tr><#else> <#assign renderRow=false> </#if>
+            <#if renderRow==true></tr><tr><#else> <#assign renderRow=false> </#if>
             <td bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>">${propertyName}</td>
             <td bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>"><#if stackObject.value.get(propertyName)?exists>${stackObject.value.get(propertyName).toString()}<#else>null</#if></td>
     </tr>