diff --git a/core/src/main/java/org/apache/struts2/components/Else.java b/core/src/main/java/org/apache/struts2/components/Else.java
index 041d9c0ec..e395264e5 100644
--- a/core/src/main/java/org/apache/struts2/components/Else.java
+++ b/core/src/main/java/org/apache/struts2/components/Else.java
@@ -61,11 +61,9 @@ public class Else extends Component {
     public boolean start(Writer writer) {
         Map context = stack.getContext();
         Boolean ifResult = (Boolean) context.get(If.ANSWER);
-        ifResult = ifResult == null ? Boolean.FALSE : ifResult;
 
         context.remove(If.ANSWER);
 
-        //return !((ifResult == null) || (ifResult.booleanValue()));
-        return ! ifResult.booleanValue();
+        return !((ifResult == null) || (ifResult.booleanValue()));
     }
 }
diff --git a/core/src/main/java/org/apache/struts2/components/ElseIf.java b/core/src/main/java/org/apache/struts2/components/ElseIf.java
index d9a97bf37..2ad93f0ba 100644
--- a/core/src/main/java/org/apache/struts2/components/ElseIf.java
+++ b/core/src/main/java/org/apache/struts2/components/ElseIf.java
@@ -67,10 +67,8 @@ public class ElseIf extends Component {
 
     public boolean start(Writer writer) {
         Boolean ifResult = (Boolean) stack.getContext().get(If.ANSWER);
-        ifResult = ifResult == null ? Boolean.FALSE : ifResult;
         
-        //if ((ifResult == null) || (ifResult.booleanValue())) {
-        if (ifResult.booleanValue()) {
+        if ((ifResult == null) || (ifResult.booleanValue())) {
             return false;
         }
 
diff --git a/core/src/main/java/org/apache/struts2/components/If.java b/core/src/main/java/org/apache/struts2/components/If.java
index 619f8d4ef..8b16f974f 100644
--- a/core/src/main/java/org/apache/struts2/components/If.java
+++ b/core/src/main/java/org/apache/struts2/components/If.java
@@ -84,7 +84,7 @@ public class If extends Component {
         if (answer == null) {
             answer = Boolean.FALSE;
         }
-        
+        stack.getContext().put(ANSWER, answer);
         return answer.booleanValue();
     }