diff --git a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java
index a96d4c9..99e3438 100644
--- a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java
+++ b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java
@@ -589,7 +589,8 @@ public abstract class FlowController extends PageFlowManagedObject
         }
         finally
         {
-            setPerRequestState( prevState );
+            if(prevState != null)
+                setPerRequestState( prevState );
 
             PageFlowControlContainer pfcc = PageFlowControlContainerFactory.getControlContainer(request,getServletContext());
             pfcc.endContextOnPageFlow(this);