diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java
index b9c98621b..69e78b7ea 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java
@@ -144,7 +144,7 @@ public class XWorkBasicConverter extends DefaultTypeConverter {
     private Object doConvertToCharacter(Object value) {
         if (value instanceof String) {
             String cStr = (String) value;
-            return (cStr.length() > 0) ? new Character(cStr.charAt(0)) : null;
+            return (cStr.length() > 0) ? cStr.charAt(0) : null;
         }
         return null;
     }
@@ -159,7 +159,7 @@ public class XWorkBasicConverter extends DefaultTypeConverter {
 
     private Class doConvertToClass(Object value) {
         Class clazz = null;
-        if (value instanceof String && value != null && ((String) value).length() > 0) {
+        if (value != null && value instanceof String && ((String) value).length() > 0) {
             try {
                 clazz = Class.forName((String) value);
             } catch (ClassNotFoundException e) {