--- XPathUtil.java-2005-09-13	2005-09-13 13:11:07.000000000 +0100
+++ XPathUtil.java-2005-09-13	2005-09-13 13:12:59.000000000 +0100
@@ -97,16 +97,19 @@ 
             variableVector.addElement( new QName(null, varName ) );
             globalVarSize++;
         }
-        enum_ = pageContext.getAttributeNamesInScope( 
-            PageContext.SESSION_SCOPE );
-        while ( enum_.hasMoreElements() ) {
-            String varName = (String)enum_.nextElement();
-            QName varQName = new QName ( SESSION_NS_URL, SESSION_P,varName); 
-            //Adding both namespace qualified QName and just localName
-            variableVector.addElement( varQName );
-            globalVarSize++;
-            variableVector.addElement( new QName(null, varName ) );
-            globalVarSize++;
+	if ( pageContext.getSession() != null ) {
+            enum_ = pageContext.getAttributeNamesInScope( 
+                PageContext.SESSION_SCOPE );
+            while ( enum_.hasMoreElements() ) {
+                String varName = (String)enum_.nextElement();
+                QName varQName = 
+                  new QName ( SESSION_NS_URL, SESSION_P,varName); 
+                //Adding both namespace qualified QName and just localName
+                variableVector.addElement( varQName );
+                globalVarSize++;
+                variableVector.addElement( new QName(null, varName ) );
+                globalVarSize++;
+            }
         }
         enum_ = pageContext.getAttributeNamesInScope( 
             PageContext.APPLICATION_SCOPE );