diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 92fef480e511705c8f175b3190c3bbb40303a32d..9eb59464b96a0ffb08d3b6d5c39ee9575d5f274c 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -68,7 +68,7 @@ function _get360Data(pSelectMap, pBaseContextId, pContactId, pContextList, pActi
                 record[5] = translate.text(pActive);
             else
             {
-               if(pSelectMap[context].activeStates.indexOf(row[3]) > -1)    
+               if(pSelectMap[context].activeStates && pSelectMap[context].activeStates.indexOf(row[3]) > -1)    
                   record[5] = translate.text("true");
                else
                   record[5] = translate.text("false");
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index b9e558392fa7b80b6e1ef2cb35753bc1685dc64b..8976e941145178f890c0e7deae0eb4f7b3835fd8 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -294,6 +294,9 @@ ContextSelector.create = function(pTableName, pIdField, pTitleExpression)
  */
 ContextSelector.prototype.getFullField = function(pField)
 {
+    //always keep undefined (and null) just undefined since it's never a fullQualifier and tablename.undefined is useless
+    if (pField == undefined)
+        return undefined;
     if (SqlUtils.isFullFieldQualifier(pField))
         return pField;
     else