diff --git a/SOPE/GDLContentStore/GCSSessionsFolder.m b/SOPE/GDLContentStore/GCSSessionsFolder.m
index b550ec974..4dc08960c 100644
--- a/SOPE/GDLContentStore/GCSSessionsFolder.m
+++ b/SOPE/GDLContentStore/GCSSessionsFolder.m
@@ -204,7 +204,7 @@ static NSString *sessionsFolderURLString = nil;
   NSArray *attrs;
   NSDictionary *record;
   EOEntity *entity;
-  EOSQLQualifier *qualifier;
+  EOQualifier *qualifier;
 
   record = nil;
 
@@ -217,6 +217,7 @@ static NSString *sessionsFolderURLString = nil;
                                          qualifierFormat:
                                             @"c_id='%@'",
                                           theID];
+
       [qualifier autorelease];
 
       [context beginTransaction];
diff --git a/SoObjects/SOGo/SOGoSession.m b/SoObjects/SOGo/SOGoSession.m
index 8f07b4910..be003acc2 100644
--- a/SoObjects/SOGo/SOGoSession.m
+++ b/SoObjects/SOGo/SOGoSession.m
@@ -45,6 +45,11 @@
 
   cache = [SOGoCache sharedCache];
 
+  //We check that the session is base64
+  NSData *decodedData = [[NSData alloc] initWithBase64EncodedString:theSessionKey options:0];
+  if(!decodedData)
+    return value;
+
   key = [NSString stringWithFormat: @"session:%@", theSessionKey];
   value = [cache valueForKey: key];