diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index ec9c5df5eeb6f5ff4382cc5e67558c52d5964195..f874df83c53fbe0253029bc75ecc62615e5e6138 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4659,9 +4659,11 @@ module OneM2M_Functions {
 			        v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort);
 			    }
 			}
-			v_poa := v_poa & "/" & p_additionalContext;
+			if(p_additionalContext != ""){
+				v_poa := v_poa & "/" & p_additionalContext;
+			}
 			
-			return v_poa;
+            return v_poa;
 		}
 				
 		/**
@@ -4696,7 +4698,9 @@ module OneM2M_Functions {
 			        v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.remotePort);
 			    }
 			}
-			v_poa := v_poa & "/" & p_additionalContext;
+			if(p_additionalContext != ""){
+				v_poa := v_poa & "/" & p_additionalContext;
+			}
 			
 			return v_poa;
 		}