diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 7c1808c961a6915a438f957e0216f112fed503fa..6d17f2b1c640bce4223489d2f54a14f1a3b72c80 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 241 2017-03-23 17:59:00Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 242 2017-03-24 15:18:47Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
@@ -1028,9 +1028,11 @@ module OneM2M_Functions {
 				if(PX_IS_LOC_CONTAINER){
 					p_request.primitiveContent.any_1[0].Container_optional.locationID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);//resourceID of the locationPolicy
 				}	
-				if(match(valueof(p_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs), v_defaultAcpIDs )){
-					p_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
-				}	  
+				if(ispresent(p_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs)) {
+        			if(match(valueof(p_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs), v_defaultAcpIDs )){
+        				p_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
+        			}	
+				}  
 			}
 			
 			if (p_resourceType == int15) {//pollingChannel