diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 625a60348657910cc5bbcd22f1b082751dad238e..73d191e8afcd1ae3c1915342789bc55945203a6b 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3067,7 +3067,9 @@ module OneM2M_Functions {
 					}
 				} else if(p_resourceType == int3 and ispresent(p_resource)) { //Container
 					if(ischosen(p_resource.container)){
-						v_myResource.container := valueof(p_resource.container);
+						if(isvalue(p_resource.container)) {
+							v_myResource.container := valueof(p_resource.container);
+						}
 						v_myResource.container.resourceType := p_resourceType;
       					
 						v_myResource.container.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);