1 files changed, 7 insertions, 1 deletions
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.java
index 96e3b5f8..9fcc97dd 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.java
@@ -132,6 +132,10 @@ public class Router implements CseService {
 			}
 
 			// URI Handling
+			if(request.getTo() == null && request.getTargetId() == null){
+				throw new BadRequestException("No To parameter provided provided");
+			}
+			
 			if(request.getTargetId() == null){
 				request.setTargetId(request.getTo());
 			}
@@ -400,8 +404,10 @@ public class Router implements CseService {
 			
 			if(request.getTo() == null){
 				request.setTo(request.getTargetId().split("\\?")[0]);
-				request.setTargetId(request.getTo());
+			} else {
+				request.setTo(request.getTo().split("\\?")[0]);
 			}
+			request.setTargetId(request.getTo());
 		}
 
 	}