Small changes for Router to prevent NullPointerException from user code

Signed-off-by: Joern Bernhardt <jb@campudus.com>